From 5a5ca056ba439d2ff3fec19e97fb7111f9fe9819 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Tue, 26 May 2009 10:21:22 -0700
Subject: Restore default facility for 'syslog console'

Bug 4051
 set system syslog console
needs to default to:
 set system syslog console facility all level err
---
 templates/system/syslog/console/facility/node.def | 1 +
 1 file changed, 1 insertion(+)

(limited to 'templates')

diff --git a/templates/system/syslog/console/facility/node.def b/templates/system/syslog/console/facility/node.def
index 98b207d5..3767f4b7 100644
--- a/templates/system/syslog/console/facility/node.def
+++ b/templates/system/syslog/console/facility/node.def
@@ -1,6 +1,7 @@
 tag:
 type: txt
 help: Set facility for console logging
+default: "all"
 syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility"
 comp_help:Available logging facilities:
   all           All facilities excluding "mark"
-- 
cgit v1.2.3


From 1480cbfd0056d209aa872216938ec1b9226186ed Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Wed, 27 May 2009 09:08:20 -0700
Subject: Revert "Restore default facility for 'syslog console'"

This reverts commit 5a5ca056ba439d2ff3fec19e97fb7111f9fe9819.
---
 templates/system/syslog/console/facility/node.def | 1 -
 1 file changed, 1 deletion(-)

(limited to 'templates')

diff --git a/templates/system/syslog/console/facility/node.def b/templates/system/syslog/console/facility/node.def
index 3767f4b7..98b207d5 100644
--- a/templates/system/syslog/console/facility/node.def
+++ b/templates/system/syslog/console/facility/node.def
@@ -1,7 +1,6 @@
 tag:
 type: txt
 help: Set facility for console logging
-default: "all"
 syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility"
 comp_help:Available logging facilities:
   all           All facilities excluding "mark"
-- 
cgit v1.2.3


From 5296d938dddf85d50d1b61dfb628a74905f778e8 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Wed, 27 May 2009 09:35:14 -0700
Subject: NTP management version 3

1. Don't start NTP server at boot (network not configed yet)
2. Start NTP as needed based on vyatta config
---
 debian/vyatta-cfg-system.postinst.in |  5 +----
 templates/system/ntp-server/node.def | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'templates')

diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index 57f4b043..ec159432 100644
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -7,13 +7,10 @@ bindir=@bindir@
 sbindir=@sbindir@
 
 # remove init of daemons that we start/stop
-for init in ssh snmpd openhpid vyatta-keepalived ipvsadm dnsmasq ddclient; do
+for init in ntp ssh snmpd openhpid vyatta-keepalived ipvsadm dnsmasq ddclient; do
   update-rc.d -f ${init} remove >/dev/null
 done
 
-# for upgrade make sure ntp is run during boot
-update-rc.d ntp defaults
-
 # remove extra call to clock setup only need one. this speeds up boot 
 # Mystery: why does Debian do it twice?
 if [ -L /etc/rcS.d/S08hwclockfirst.sh -a -L /etc/rcS.d/S11hwclock.sh ]; then
diff --git a/templates/system/ntp-server/node.def b/templates/system/ntp-server/node.def
index f1318b28..c8e3a9f2 100644
--- a/templates/system/ntp-server/node.def
+++ b/templates/system/ntp-server/node.def
@@ -1,15 +1,17 @@
 multi:
 type: txt
 help: Set name or IP address of Network Time Protocol (NTP) server
-update: if ! grep -q '^server $VAR(@) ' /etc/ntp.conf
-       then sudo sh -c \
-	  "echo \"server $VAR(@) iburst\" >> /etc/ntp.conf;
-           /usr/sbin/invoke-rc.d ntp restart"
-       fi
-delete: if grep -q '^server.*$VAR(@) ' /etc/ntp.conf
-	then sudo sed -i '/^server $VAR(@) /d' /etc/ntp.conf
-	     if grep -q '^server ' /etc/ntp.conf
-             then sudo /usr/sbin/invoke-rc.d ntp restart
-	     else sudo /usr/sbin/invoke-rc.d ntp stop
-             fi
+create: if ! grep -q '^server $VAR(@) ' /etc/ntp.conf
+        then sudo sh -c \
+	   "echo \"server $VAR(@) iburst\" >> /etc/ntp.conf; \
+	    /usr/sbin/invoke-rc.d ntp restart"
+        elif ! /usr/sbin/invoke-rc.d ntp status
+	then sudo /usr/sbin/invoke-rc.d ntp start
 	fi
+delete: if grep -q '^server $VAR(@) ' /etc/ntp.conf
+	then sudo sed -i '/^server $VAR(@) /d' /etc/ntp.conf
+	   if grep -q '^server ' /etc/ntp.conf
+	   then sudo /usr/sbin/invoke-rc.d ntp restart
+	   else sudo /usr/sbin/invoke-rc.d ntp stop
+	   fi
+        fi
-- 
cgit v1.2.3