diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2007-11-05 18:42:50 -0800 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2007-11-05 18:42:50 -0800 |
| commit | d742d5e53b5ed8f58714038a2275808fcaeb1dcc (patch) | |
| tree | 50536ca93dc639b958efb594402ac171ac642dd5 /templates/system/syslog/global | |
| parent | ae49927598cb7e5d18776b277181670f0207d4ad (diff) | |
| download | vyatta-cfg-quagga-d742d5e53b5ed8f58714038a2275808fcaeb1dcc.tar.gz vyatta-cfg-quagga-d742d5e53b5ed8f58714038a2275808fcaeb1dcc.zip | |
add help and syntax check for syslog facilities/levels.
this also fixes bug 2427 (and 1812?).
Diffstat (limited to 'templates/system/syslog/global')
| -rw-r--r-- | templates/system/syslog/global/facility/node.def | 33 | ||||
| -rw-r--r-- | templates/system/syslog/global/facility/node.tag/level/node.def | 10 |
2 files changed, 40 insertions, 3 deletions
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 |