diff options
| -rw-r--r-- | sysconf/ntp.conf | 5 | ||||
| -rw-r--r-- | templates/system/ntp-server/node.def | 19 |
2 files changed, 10 insertions, 14 deletions
diff --git a/sysconf/ntp.conf b/sysconf/ntp.conf index 86ee86c1..1a867047 100644 --- a/sysconf/ntp.conf +++ b/sysconf/ntp.conf @@ -2,9 +2,6 @@ driftfile /var/lib/ntp/ntp.drift -# You do need to talk to an NTP server or two (or three). -server 0.vyatta.pool.ntp.org - # Access control configuration; see /usr/share/doc/ntp-doc/html/accopt.html for # details. The web page <http://support.ntp.org/bin/view/Support/AccessRestrictions> # might also be helpful. @@ -35,3 +32,5 @@ restrict ::1 #disable auth #broadcastclient +# You do need to talk to an NTP server or two (or three). +server 0.vyatta.pool.ntp.org iburst diff --git a/templates/system/ntp-server/node.def b/templates/system/ntp-server/node.def index 21961951..f1318b28 100644 --- a/templates/system/ntp-server/node.def +++ b/templates/system/ntp-server/node.def @@ -1,18 +1,15 @@ multi: type: txt help: Set name or IP address of Network Time Protocol (NTP) server -update: if ! grep -q '^server. *$VAR(@)\$' /etc/ntp.conf +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:sudo sh -c \ - "touch /etc/ntp.conf - if grep -q 'server.*$VAR(@)' /etc/ntp.conf; then - sed -i '/server $VAR(@)/d' /etc/ntp.conf - if grep -q '^server ' /etc/ntp.conf; then - /usr/sbin/invoke-rc.d ntp restart - else - /usr/sbin/invoke-rc.d ntp stop - fi - 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 |