diff options
| author | Stig Thormodsrud <stig@vyatta.com> | 2009-04-03 10:27:33 -0700 |
|---|---|---|
| committer | Stig Thormodsrud <stig@vyatta.com> | 2009-04-03 10:27:33 -0700 |
| commit | 212e98ccdbca930017a67217e55f479d6b571a8d (patch) | |
| tree | 544a88935b58011173a69cbe45a32660700a378f | |
| parent | 14a7c196b5903e6e18fb2fe3072746d1891b13c8 (diff) | |
| parent | 182a4a3e8119c15602784b183ffdd79b17e55907 (diff) | |
| download | vyatta-cfg-quagga-212e98ccdbca930017a67217e55f479d6b571a8d.tar.gz vyatta-cfg-quagga-212e98ccdbca930017a67217e55f479d6b571a8d.zip | |
Merge branch 'jenner' of http://git.vyatta.com/vyatta-cfg-system into jenner
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | templates/service/dns/dynamic/interface/node.def | 2 | ||||
| -rw-r--r-- | templates/service/dns/forwarding/listen-on/node.def | 2 | ||||
| -rw-r--r-- | templates/system/syslog/node.def | 6 |
4 files changed, 16 insertions, 5 deletions
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 <stephen.hemminger@vyatta.com> 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. 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" 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 |