From 1979d595efbccf4abe793ee29ad3f11848951887 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 1 Apr 2009 12:23:28 -0700 Subject: Change lack of interface in DDNS back to warning If program can handle it no point in enforcing in CLI. --- templates/service/dns/dynamic/interface/node.def | 2 +- templates/service/dns/forwarding/listen-on/node.def | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/service/dns/dynamic/interface/node.def b/templates/service/dns/dynamic/interface/node.def index c402e483..de6afa69 100644 --- a/templates/service/dns/dynamic/interface/node.def +++ b/templates/service/dns/dynamic/interface/node.def @@ -2,8 +2,8 @@ tag: help: Set interface to send DDNS updates for type: txt allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=all -syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=all" commit:expression: $VAR(./@/service/@@) != ""; "At least one service must be set to send DDNS updates for $VAR(@)" +commit:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --warn" delete:touch /tmp/ddclient_$VAR(@).$PPID diff --git a/templates/service/dns/forwarding/listen-on/node.def b/templates/service/dns/forwarding/listen-on/node.def index 9032b7f0..73913bb5 100644 --- a/templates/service/dns/forwarding/listen-on/node.def +++ b/templates/service/dns/forwarding/listen-on/node.def @@ -2,4 +2,4 @@ multi: type: txt help: Set interface to listen for DNS queries allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=all -syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=all" +commit:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --warn" -- cgit v1.2.3 From fabb599d2998cfd50433521f3af3cb1ced56f904 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 1 Apr 2009 16:46:03 -0700 Subject: Update template to handle change in default syslog.conf Makes global facility change work. Still need to rework the syslog templates and parsing. --- templates/system/syslog/node.def | 6 +++--- 1 file 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 -- cgit v1.2.3 From 182a4a3e8119c15602784b183ffdd79b17e55907 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 1 Apr 2009 16:52:02 -0700 Subject: 0.15.17 --- debian/changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 182bcc8b..6f30f2a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +vyatta-cfg-system (0.15.17) unstable; urgency=low + + [ Stig Thormodsrud ] + * Change "syntax" check to "commit" check for virtual interfaces. + * 0.15.16 + + [ Stephen Hemminger ] + * Update template to handle change in default syslog.conf + + -- Stephen Hemminger Wed, 01 Apr 2009 16:52:02 -0700 + vyatta-cfg-system (0.15.16) unstable; urgency=low * Change "syntax" check to "commit" check for virtual interfaces. -- cgit v1.2.3