summaryrefslogtreecommitdiff
path: root/templates/system/syslog/node.def
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@vyatta.com>2009-04-03 10:27:33 -0700
committerStig Thormodsrud <stig@vyatta.com>2009-04-03 10:27:33 -0700
commit212e98ccdbca930017a67217e55f479d6b571a8d (patch)
tree544a88935b58011173a69cbe45a32660700a378f /templates/system/syslog/node.def
parent14a7c196b5903e6e18fb2fe3072746d1891b13c8 (diff)
parent182a4a3e8119c15602784b183ffdd79b17e55907 (diff)
downloadvyatta-cfg-system-212e98ccdbca930017a67217e55f479d6b571a8d.tar.gz
vyatta-cfg-system-212e98ccdbca930017a67217e55f479d6b571a8d.zip
Merge branch 'jenner' of http://git.vyatta.com/vyatta-cfg-system into jenner
Diffstat (limited to 'templates/system/syslog/node.def')
-rw-r--r--templates/system/syslog/node.def6
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/system/syslog/node.def b/templates/system/syslog/node.def
index 7fd911f7..6bca3490 100644
--- a/templates/system/syslog/node.def
+++ b/templates/system/syslog/node.def
@@ -1,11 +1,11 @@
help: Configure syslog daemon
end: if [ -n "$VAR(./global/facility/@@)" ]; then
# remove the default config for global messages
- sudo sh -c "sed -i '/\*\.notice[[:space:]]*-\/var\/log\/messages/d' /etc/syslog.conf"
+ sudo sh -c "sed -i '/\*\.notice;local7\.\*[[:space:]]*-\/var\/log\/messages/d' /etc/syslog.conf"
else
# if not already there then write the default config for global messages
- if ! grep -q "\*\.notice[[:space:]]*-/var/log/messages" /etc/syslog.conf; then
- sudo sh -c "echo \"*.notice -/var/log/messages\" >> /etc/syslog.conf"
+ if ! grep -q "\*\.notice;local7\.\*[[:space:]]*-/var/log/messages" /etc/syslog.conf; then
+ sudo sh -c "echo \"*.notice;local7.* -/var/log/messages\" >> /etc/syslog.conf"
fi
fi
sudo /usr/sbin/invoke-rc.d sysklogd restart