diff options
Diffstat (limited to 'templates')
| -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 |
3 files changed, 5 insertions, 5 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" 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 |