From 0a60c68af7028fe58c3ece088c85fd3a04eb9a1f Mon Sep 17 00:00:00 2001
From: Mohit Mehta <mohit.mehta@vyatta.com>
Date: Fri, 10 Oct 2008 22:27:30 -0700
Subject: Fix Bug 3751 configuring multiple global syslog facilities overwrites
 previous ones in /etc/syslog.conf - multiple nodes configured under 'system
 syslog global' are appended to syslog.conf - default '*.notice
 -/var/log/messages' is removed from syslog.conf if any   node is configured
 under 'system syslog global' and is put back when nothing   configured under
 'system syslog global' - syslog process only restarted once after making all
 changes in config - added commit checks at 'system syslog <>' level nodes to
 specify facility

---
 templates/system/syslog/global/facility/node.def | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'templates/system/syslog/global/facility/node.def')

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
-- 
cgit v1.2.3