diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-04-01 16:46:03 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-04-01 16:46:03 -0700 |
| commit | fabb599d2998cfd50433521f3af3cb1ced56f904 (patch) | |
| tree | e1c66a5ad0e7f0fd28d7dd19e7de9686ad229df6 /templates/system/syslog | |
| parent | be02913ee7f3e0e79e98a44c27e62509971ea501 (diff) | |
| download | vyatta-cfg-system-fabb599d2998cfd50433521f3af3cb1ced56f904.tar.gz vyatta-cfg-system-fabb599d2998cfd50433521f3af3cb1ced56f904.zip | |
Update template to handle change in default syslog.conf
Makes global facility change work.
Still need to rework the syslog templates and parsing.
Diffstat (limited to 'templates/system/syslog')
| -rw-r--r-- | templates/system/syslog/node.def | 6 |
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 |