syslog: add dataplane as alias for local6

Enable debug log for dataplane

7 files changed, 21 insertions, 17 deletions

diff --git a/scripts/system/vyatta_update_syslog.pl b/scripts/system/vyatta_update_syslog.pl
index 3421d61a..043f41e3 100755
--- a/scripts/system/vyatta_update_syslog.pl
+++ b/scripts/system/vyatta_update_syslog.pl
@@ -65,6 +65,7 @@ sub get_target_param {
 my %facmap = (
     'all'       => '*',
     'protocols' => 'local7',
+    'dataplane' => 'local6',
 );
 
 # This builds a data structure that maps from target
diff --git a/sysconf/vyatta-log.conf b/sysconf/vyatta-log.conf
index 77d51a76..0b9015f7 100644
--- a/sysconf/vyatta-log.conf
+++ b/sysconf/vyatta-log.conf
@@ -1 +1 @@
-*.notice;local7.debug	-/var/log/messages
+*.notice;local6.debug;local7.debug	-/var/log/messages
diff --git a/templates/system/syslog/console/facility/node.def b/templates/system/syslog/console/facility/node.def
index 4082a46f..0513a6ae 100644
--- a/templates/system/syslog/console/facility/node.def
+++ b/templates/system/syslog/console/facility/node.def
@@ -1,9 +1,10 @@
 tag:
 type: txt
 help: Facility for console logging
-syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility"
-allowed: echo auth authpriv cron daemon kern lpr mail mark news protocols \
-	security syslog user uucp \
+syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "dataplane", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all" ;
+	 "\"$VAR(@)\" is not a valid logging facility"
+allowed: echo auth authpriv cron daemon dataplane kern lpr mail mark news \
+        protocols security syslog user uucp \
 	local0 local1 local2 local3 local4 local5 local6 local7 all
 
 val_help: all; All facilities excluding "mark"
diff --git a/templates/system/syslog/file/node.tag/facility/node.def b/templates/system/syslog/file/node.tag/facility/node.def
index 8544bfba..8c74e7c8 100644
--- a/templates/system/syslog/file/node.tag/facility/node.def
+++ b/templates/system/syslog/file/node.tag/facility/node.def
@@ -1,10 +1,10 @@
 tag:
 type: txt
 help: Facility for file logging
-syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility"
-
-allowed: echo auth authpriv cron daemon kern lpr mail mark news protocols \
-	security syslog user uucp \
+syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "dataplane", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all" ;
+	 "\"$VAR(@)\" is not a valid logging facility"
+allowed: echo auth authpriv cron daemon dataplane kern lpr mail mark news \
+        protocols security syslog user uucp \
 	local0 local1 local2 local3 local4 local5 local6 local7 all
 
 val_help: all; All facilities excluding "mark"
diff --git a/templates/system/syslog/global/facility/node.def b/templates/system/syslog/global/facility/node.def
index 58198d9f..13320c7c 100644
--- a/templates/system/syslog/global/facility/node.def
+++ b/templates/system/syslog/global/facility/node.def
@@ -1,9 +1,10 @@
 tag:
 type: txt
 help: Facility for system logging
-syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all" ; "\"$VAR(@)\" is not a valid logging facility"
-allowed: echo auth authpriv cron daemon kern lpr mail mark news protocols \
-	security syslog user uucp \
+syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "dataplane", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all" ;
+	"\"$VAR(@)\" is not a valid logging facility"
+allowed: echo auth authpriv cron daemon dataplane kern lpr mail mark news \
+        protocols security syslog user uucp \
 	local0 local1 local2 local3 local4 local5 local6 local7 all
 
 val_help: all; All facilities excluding "mark"
diff --git a/templates/system/syslog/host/node.tag/facility/node.def b/templates/system/syslog/host/node.tag/facility/node.def
index 76b8f793..0e0ce9b5 100644
--- a/templates/system/syslog/host/node.tag/facility/node.def
+++ b/templates/system/syslog/host/node.tag/facility/node.def
@@ -1,12 +1,12 @@
 tag:
 type: txt
 help: Facility for host logging
-syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility"
-allowed: echo auth authpriv cron daemon kern lpr mail mark news protocols \
-	security syslog user uucp \
+syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "dataplane", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all" ;
+	 "\"$VAR(@)\" is not a valid logging facility"
+allowed: echo auth authpriv cron daemon dataplane kern lpr mail mark news \
+        protocols security syslog user uucp \
 	local0 local1 local2 local3 local4 local5 local6 local7 all
 
-
 val_help: all; All facilities excluding "mark"
 val_help: auth; Authentication and authorization
 val_help: authpriv; Non-system authorization
diff --git a/templates/system/syslog/user/node.tag/facility/node.def b/templates/system/syslog/user/node.tag/facility/node.def
index c5cfad72..b43a6d61 100644
--- a/templates/system/syslog/user/node.tag/facility/node.def
+++ b/templates/system/syslog/user/node.tag/facility/node.def
@@ -1,8 +1,9 @@
 tag:
 type: txt
 help: Facility for user logging
-syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility"
-allowed: echo auth authpriv cron daemon kern lpr mail mark news protocols \
+syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "dataplane", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all" ;
+	"\"$VAR(@)\" is not a valid logging facility"
+allowed: echo auth authpriv cron daemon dataplane kern lpr mail mark news protocols \
 	security syslog user uucp \
 	local0 local1 local2 local3 local4 local5 local6 local7 all