diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 14:14:38 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 14:14:38 -0700 |
| commit | 87e65021f2a105070cd44578a3d91bef8da2b8e1 (patch) | |
| tree | 429374e641f3c43e7b90faa1bac6e435fa37c50e /templates/system/syslog/global | |
| parent | 21403e009437db547a949c1a611fafcaf015ad37 (diff) | |
| parent | facdd6ec66cb4b8eb45794f2b05cdc8d5bd2ed46 (diff) | |
| download | vyatta-cfg-quagga-87e65021f2a105070cd44578a3d91bef8da2b8e1.tar.gz vyatta-cfg-quagga-87e65021f2a105070cd44578a3d91bef8da2b8e1.zip | |
Merge branch 'islavista' of suva.vyatta.com:/git/vyatta-cfg-system into islavista
Diffstat (limited to 'templates/system/syslog/global')
| -rw-r--r-- | templates/system/syslog/global/facility/node.def | 6 | ||||
| -rw-r--r-- | templates/system/syslog/global/node.def | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/templates/system/syslog/global/facility/node.def b/templates/system/syslog/global/facility/node.def index cff98650..8133aebf 100644 --- a/templates/system/syslog/global/facility/node.def +++ b/templates/system/syslog/global/facility/node.def @@ -4,12 +4,12 @@ help: Set facility for system logging syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility" update:expression: "sudo sh -c \"LVL=`echo -n $VAR(level/@) | tr '[a-z]' '[A-Z]'` && \ FAC='$VAR(@)' ; if [ x\\$FAC == xall ]; then FAC='*'; fi && \ -/opt/vyatta/sbin/vyatta_update_syslog.pl '' '\\/var\\/log\\/messages' \ - \\\"\\$FAC.\\$LVL\t/var/log/messages \n\\\"\" " +/opt/vyatta/sbin/vyatta_update_syslog.pl \\\"\\$FAC\\.\\\" '\\/var\\/log\\/messages' \ + \\\"\\$FAC.\\$LVL\t-/var/log/messages \n\\\"\" " delete:expression: "sudo sh -c \"FAC='$VAR(@)' ; \ if [ x\\$FAC == xall ]; then FAC='*'; fi && \ /opt/vyatta/sbin/vyatta_update_syslog.pl \ - '' '\\/var\\/log\\/messages' '*.warning\t/var/log/messages \n'\" " + \\\"\\$FAC\\.\\\" '\\/var\\/log\\/messages' ''\" " comp_help:Available logging facilities: all All facilities excluding "mark" auth Authentication and authorization diff --git a/templates/system/syslog/global/node.def b/templates/system/syslog/global/node.def index 175d85e1..e5c441a8 100644 --- a/templates/system/syslog/global/node.def +++ b/templates/system/syslog/global/node.def @@ -1 +1,2 @@ help: Set system logging +commit:expression: $VAR(./facility/) != "" || $VAR(./archive/) != ""; "Must specify either facility or archive for syslog file" |