add help and syntax check for syslog facilities/levels.

this also fixes bug 2427 (and 1812?).

10 files changed, 204 insertions, 21 deletions

diff --git a/templates/system/syslog/console/facility/node.def b/templates/system/syslog/console/facility/node.def
index c5d0d76f..a46ac2f0 100644
--- a/templates/system/syslog/console/facility/node.def
+++ b/templates/system/syslog/console/facility/node.def
@@ -1,8 +1,35 @@
 tag:
 type: txt
 help: "Configure facility for console logging"
+syntax: $(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$(@)\" is not a valid logging facility"
 update: "sudo sh -c \"LVL=`echo -n $(level/@) | tr '[a-z]' '[A-Z]'` && \
-/opt/vyatta/sbin/vyatta_update_syslog.pl '$(@)\\.' '\\/dev\\/console' \
-\\\"$(@).\\\\\$LVL\t/dev/console\n\\\"\" "
-delete: "sudo sh -c \"/opt/vyatta/sbin/vyatta_update_syslog.pl \
-'$(@)\\.' '\\/dev\\/console' ''\" "
+FAC='$(@)' ; if [ x\\\\\$FAC == xall ]; then FAC='*'; fi && \
+/opt/vyatta/sbin/vyatta_update_syslog.pl \\\"\\\\\$FAC\\.\\\" \
+  '\\/dev\\/console' \\\"\\\\\$FAC.\\\\\$LVL\t/dev/console\n\\\"\" "
+delete: "sudo sh -c \"FAC='$(@)' ; \
+if [ x\\\\\$FAC == xall ]; then FAC='*'; fi && \
+/opt/vyatta/sbin/vyatta_update_syslog.pl \\\"\\\\\$FAC\\.\\\" \
+  '\\/dev\\/console' ''\" "
+#comp_help:Available logging facilities:
+#  all           All facilities excluding "mark"
+#  auth          Authentication and authorization
+#  authpriv      Non-system authorization
+#  cron          Cron daemon
+#  daemon        System daemons
+#  kern          Kernel
+#  lpr           Line printer spooler
+#  mail          Mail subsystem
+#  mark          Timestamp
+#  news          USENET subsystem
+#  security      Authentication and authorization
+#  syslog        Authentication and authorization
+#  user          Application processes
+#  uucp          UUCP subsystem
+#  local0        Local facility 0
+#  local1        Local facility 1
+#  local2        Local facility 2
+#  local3        Local facility 3
+#  local4        Local facility 4
+#  local5        Local facility 5
+#  local6        Local facility 6
+#  local7        Local facility 7
diff --git a/templates/system/syslog/console/facility/node.tag/level/node.def b/templates/system/syslog/console/facility/node.tag/level/node.def
index 9be459c6..ea75775a 100644
--- a/templates/system/syslog/console/facility/node.tag/level/node.def
+++ b/templates/system/syslog/console/facility/node.tag/level/node.def
@@ -1,3 +1,13 @@
 type: txt
 help: "Configure the logging level"
+syntax: $(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$(@)\" is not a valid logging level"
 default: "err"
+#comp_help:Logging levels in descending order of severity:
+#  emerg        Emergency messages
+#  alert        Urgent messages
+#  crit         Critical messages 
+#  err          Error messages
+#  warning      Warning messages
+#  notice       Messages for further investigation
+#  info         Informational messages
+#  debug        Debug messages
diff --git a/templates/system/syslog/file/node.tag/facility/node.def b/templates/system/syslog/file/node.tag/facility/node.def
index af3ab498..e4f018ec 100644
--- a/templates/system/syslog/file/node.tag/facility/node.def
+++ b/templates/system/syslog/file/node.tag/facility/node.def
@@ -1,9 +1,36 @@
 tag:
 type: txt
 help: "Configure facility for file logging"
+syntax: $(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$(@)\" is not a valid logging facility"
 update: "sudo sh -c \"LVL=`echo -n $(level/@) | tr '[a-z]' '[A-Z]'` && \
-/opt/vyatta/sbin/vyatta_update_syslog.pl '$(@)\\.' \
-'\\/var\\/log\\/user\\/$(../@)' \
-\\\"$(@).\\\\\$LVL\t/var/log/user/$(../@) \n\\\"\" "
-delete: "sudo sh -c \"/opt/vyatta/sbin/vyatta_update_syslog.pl '$(@)\\.' \
-'\\/var\\/log\\/user\\/$(../@)' ''\" "
+FAC='$(@)' ; if [ x\\\\\$FAC == xall ]; then FAC='*'; fi && \
+/opt/vyatta/sbin/vyatta_update_syslog.pl \\\"\\\\\$FAC\\.\\\" \
+  '\\/var\\/log\\/user\\/$(../@)' \
+  \\\"\\\\\$FAC.\\\\\$LVL\t/var/log/user/$(../@) \n\\\"\" "
+delete: "sudo sh -c \"FAC='$(@)' ; \
+if [ x\\\\\$FAC == xall ]; then FAC='*'; fi && \
+/opt/vyatta/sbin/vyatta_update_syslog.pl \\\"\\\\\$FAC\\.\\\" \
+  '\\/var\\/log\\/user\\/$(../@)' ''\" "
+#comp_help:Available logging facilities:
+#  all           All facilities excluding "mark"
+#  auth          Authentication and authorization
+#  authpriv      Non-system authorization
+#  cron          Cron daemon
+#  daemon        System daemons
+#  kern          Kernel
+#  lpr           Line printer spooler
+#  mail          Mail subsystem
+#  mark          Timestamp
+#  news          USENET subsystem
+#  security      Authentication and authorization
+#  syslog        Authentication and authorization
+#  user          Application processes
+#  uucp          UUCP subsystem
+#  local0        Local facility 0
+#  local1        Local facility 1
+#  local2        Local facility 2
+#  local3        Local facility 3
+#  local4        Local facility 4
+#  local5        Local facility 5
+#  local6        Local facility 6
+#  local7        Local facility 7
diff --git a/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def b/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def
index 9be459c6..ea75775a 100644
--- a/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def
+++ b/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def
@@ -1,3 +1,13 @@
 type: txt
 help: "Configure the logging level"
+syntax: $(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$(@)\" is not a valid logging level"
 default: "err"
+#comp_help:Logging levels in descending order of severity:
+#  emerg        Emergency messages
+#  alert        Urgent messages
+#  crit         Critical messages 
+#  err          Error messages
+#  warning      Warning messages
+#  notice       Messages for further investigation
+#  info         Informational messages
+#  debug        Debug messages
diff --git a/templates/system/syslog/global/facility/node.def b/templates/system/syslog/global/facility/node.def
index 1cfb8223..d98c2657 100644
--- a/templates/system/syslog/global/facility/node.def
+++ b/templates/system/syslog/global/facility/node.def
@@ -1,8 +1,35 @@
 tag:
 type: txt
 help: "Configure facility for system logging"
+syntax: $(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$(@)\" is not a valid logging facility"
 update: "sudo sh -c \"LVL=`echo -n $(level/@) | tr '[a-z]' '[A-Z]'` && \
+FAC='$(@)' ; if [ x\\\\\$FAC == xall ]; then FAC='*'; fi && \
 /opt/vyatta/sbin/vyatta_update_syslog.pl '' '\\/var\\/log\\/messages' \
-\\\"$(@).\\\\\$LVL\t/var/log/messages \n\\\"\" "
-delete: "sudo sh -c \"/opt/vyatta/sbin/vyatta_update_syslog.pl \
-'' '\\/var\\/log\\/messages' '*.warning\t/var/log/messages \n'\" "
+  \\\"\\\\\$FAC.\\\\\$LVL\t/var/log/messages \n\\\"\" "
+delete: "sudo sh -c \"FAC='$(@)' ; \
+if [ x\\\\\$FAC == xall ]; then FAC='*'; fi && \
+/opt/vyatta/sbin/vyatta_update_syslog.pl \
+  '' '\\/var\\/log\\/messages' '*.warning\t/var/log/messages \n'\" "
+#comp_help:Available logging facilities:
+#  all           All facilities excluding "mark"
+#  auth          Authentication and authorization
+#  authpriv      Non-system authorization
+#  cron          Cron daemon
+#  daemon        System daemons
+#  kern          Kernel
+#  lpr           Line printer spooler
+#  mail          Mail subsystem
+#  mark          Timestamp
+#  news          USENET subsystem
+#  security      Authentication and authorization
+#  syslog        Authentication and authorization
+#  user          Application processes
+#  uucp          UUCP subsystem
+#  local0        Local facility 0
+#  local1        Local facility 1
+#  local2        Local facility 2
+#  local3        Local facility 3
+#  local4        Local facility 4
+#  local5        Local facility 5
+#  local6        Local facility 6
+#  local7        Local facility 7
diff --git a/templates/system/syslog/global/facility/node.tag/level/node.def b/templates/system/syslog/global/facility/node.tag/level/node.def
index 9be459c6..ea75775a 100644
--- a/templates/system/syslog/global/facility/node.tag/level/node.def
+++ b/templates/system/syslog/global/facility/node.tag/level/node.def
@@ -1,3 +1,13 @@
 type: txt
 help: "Configure the logging level"
+syntax: $(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$(@)\" is not a valid logging level"
 default: "err"
+#comp_help:Logging levels in descending order of severity:
+#  emerg        Emergency messages
+#  alert        Urgent messages
+#  crit         Critical messages 
+#  err          Error messages
+#  warning      Warning messages
+#  notice       Messages for further investigation
+#  info         Informational messages
+#  debug        Debug messages
diff --git a/templates/system/syslog/host/node.tag/facility/node.def b/templates/system/syslog/host/node.tag/facility/node.def
index f4063eed..363875ac 100644
--- a/templates/system/syslog/host/node.tag/facility/node.def
+++ b/templates/system/syslog/host/node.tag/facility/node.def
@@ -1,8 +1,35 @@
 tag:
 type: txt
 help: "Configure facility for host logging"
+syntax: $(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$(@)\" is not a valid logging facility"
 update: "sudo sh -c \"LVL=`echo -n $(level/@) | tr '[a-z]' '[A-Z]'` && \
-/opt/vyatta/sbin/vyatta_update_syslog.pl '$(@)\\.' '@$(../@) ' \
-\\\"$(@).\\\\\$LVL\t@$(../@) \n\\\"\" "
-delete: "sudo sh -c \"/opt/vyatta/sbin/vyatta_update_syslog.pl '$(@)\\.' \
-'@$(../@) ' ''\" "
+FAC='$(@)' ; if [ x\\\\\$FAC == xall ]; then FAC='*'; fi && \
+/opt/vyatta/sbin/vyatta_update_syslog.pl \\\"\\\\\$FAC\\.\\\" '@$(../@) ' \
+  \\\"\\\\\$FAC.\\\\\$LVL\t@$(../@) \n\\\"\" "
+delete: "sudo sh -c \"FAC='$(@)' ; \
+if [ x\\\\\$FAC == xall ]; then FAC='*'; fi && \
+/opt/vyatta/sbin/vyatta_update_syslog.pl \\\"\\\\\$FAC\\.\\\" \
+  '@$(../@) ' ''\" "
+#comp_help:Available logging facilities:
+#  all           All facilities excluding "mark"
+#  auth          Authentication and authorization
+#  authpriv      Non-system authorization
+#  cron          Cron daemon
+#  daemon        System daemons
+#  kern          Kernel
+#  lpr           Line printer spooler
+#  mail          Mail subsystem
+#  mark          Timestamp
+#  news          USENET subsystem
+#  security      Authentication and authorization
+#  syslog        Authentication and authorization
+#  user          Application processes
+#  uucp          UUCP subsystem
+#  local0        Local facility 0
+#  local1        Local facility 1
+#  local2        Local facility 2
+#  local3        Local facility 3
+#  local4        Local facility 4
+#  local5        Local facility 5
+#  local6        Local facility 6
+#  local7        Local facility 7
diff --git a/templates/system/syslog/host/node.tag/facility/node.tag/level/node.def b/templates/system/syslog/host/node.tag/facility/node.tag/level/node.def
index 9be459c6..ea75775a 100644
--- a/templates/system/syslog/host/node.tag/facility/node.tag/level/node.def
+++ b/templates/system/syslog/host/node.tag/facility/node.tag/level/node.def
@@ -1,3 +1,13 @@
 type: txt
 help: "Configure the logging level"
+syntax: $(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$(@)\" is not a valid logging level"
 default: "err"
+#comp_help:Logging levels in descending order of severity:
+#  emerg        Emergency messages
+#  alert        Urgent messages
+#  crit         Critical messages 
+#  err          Error messages
+#  warning      Warning messages
+#  notice       Messages for further investigation
+#  info         Informational messages
+#  debug        Debug messages
diff --git a/templates/system/syslog/user/node.tag/facility/node.def b/templates/system/syslog/user/node.tag/facility/node.def
index 6a5d7228..a3e6e5fc 100644
--- a/templates/system/syslog/user/node.tag/facility/node.def
+++ b/templates/system/syslog/user/node.tag/facility/node.def
@@ -1,10 +1,35 @@
 tag:
 type: txt
 help: "Configure facility for user logging"
+syntax: $(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$(@)\" is not a valid logging facility"
 update: "sudo sh -c \"LVL=`echo -n $(level/@) | tr '[a-z]' '[A-Z]'` && \
-/opt/vyatta/sbin/vyatta_update_syslog.pl \\\"$(@)\\.\\\\\$LVL\\\" \
-' $(../@) ' \
-\\\"$(@).\\\\\$LVL $(../@) \n\\\"\" "
+FAC='$(@)' ; if [ x\\\\\$FAC == xall ]; then FAC='*'; fi && \
+/opt/vyatta/sbin/vyatta_update_syslog.pl \\\"\\\\\$FAC\\.\\\\\$LVL\\\" \
+  ' $(../@) ' \\\"\\\\\$FAC.\\\\\$LVL $(../@) \n\\\"\" "
 delete: "sudo sh -c \"LVL=`echo -n $(level/@) | tr '[a-z]' '[A-Z]'` && \
-/opt/vyatta/sbin/vyatta_update_syslog.pl \\\"$(@)\\.\\\\\$LVL\\\" \
-' $(../@) ' ''\" "
+FAC='$(@)' ; if [ x\\\\\$FAC == xall ]; then FAC='*'; fi && \
+/opt/vyatta/sbin/vyatta_update_syslog.pl \\\"\\\\\$FAC\\.\\\\\$LVL\\\" \
+  ' $(../@) ' ''\" "
+#comp_help:Available logging facilities:
+#  all           All facilities excluding "mark"
+#  auth          Authentication and authorization
+#  authpriv      Non-system authorization
+#  cron          Cron daemon
+#  daemon        System daemons
+#  kern          Kernel
+#  lpr           Line printer spooler
+#  mail          Mail subsystem
+#  mark          Timestamp
+#  news          USENET subsystem
+#  security      Authentication and authorization
+#  syslog        Authentication and authorization
+#  user          Application processes
+#  uucp          UUCP subsystem
+#  local0        Local facility 0
+#  local1        Local facility 1
+#  local2        Local facility 2
+#  local3        Local facility 3
+#  local4        Local facility 4
+#  local5        Local facility 5
+#  local6        Local facility 6
+#  local7        Local facility 7
diff --git a/templates/system/syslog/user/node.tag/facility/node.tag/level/node.def b/templates/system/syslog/user/node.tag/facility/node.tag/level/node.def
index 9be459c6..ea75775a 100644
--- a/templates/system/syslog/user/node.tag/facility/node.tag/level/node.def
+++ b/templates/system/syslog/user/node.tag/facility/node.tag/level/node.def
@@ -1,3 +1,13 @@
 type: txt
 help: "Configure the logging level"
+syntax: $(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$(@)\" is not a valid logging level"
 default: "err"
+#comp_help:Logging levels in descending order of severity:
+#  emerg        Emergency messages
+#  alert        Urgent messages
+#  crit         Critical messages 
+#  err          Error messages
+#  warning      Warning messages
+#  notice       Messages for further investigation
+#  info         Informational messages
+#  debug        Debug messages