From 3118e3a24e710d9fa111092b2ea7d5801557c915 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 2 Dec 2010 16:30:11 +0100 Subject: [PATCH] ntp: new enabled at default Fix ipfire ntp server defaults. Fix symlink problem if ntp was disabled. --- config/rootfiles/common/ntp | 7 +++++++ config/rootfiles/core/43/filelists/files | 1 + config/time/counter.conf | 1 + config/time/enable | 0 config/time/settime.conf | 1 + config/time/settings | 9 +++++++++ html/cgi-bin/time.cgi | 4 ++-- lfs/ntp | 9 +++++++++ src/misc-progs/timectrl.c | 2 +- 9 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 config/time/counter.conf create mode 100644 config/time/enable create mode 100644 config/time/settime.conf create mode 100644 config/time/settings diff --git a/config/rootfiles/common/ntp b/config/rootfiles/common/ntp index 82892c767f..5f21e830f4 100644 --- a/config/rootfiles/common/ntp +++ b/config/rootfiles/common/ntp @@ -16,3 +16,10 @@ usr/sbin/ntpq usr/sbin/ntptime usr/sbin/ntptrace usr/sbin/tickadj +etc/rc.d/rc0.d/K46ntpd +etc/rc.d/rc6.d/K46ntpd +etc/rc.d/rc3.d/S26ntpd +var/ipfire/time/counter.conf +var/ipfire/time/enable +var/ipfire/time/settime.conf +var/ipfire/time/settings diff --git a/config/rootfiles/core/43/filelists/files b/config/rootfiles/core/43/filelists/files index 5bc212763f..c492f47dfa 100644 --- a/config/rootfiles/core/43/filelists/files +++ b/config/rootfiles/core/43/filelists/files @@ -11,6 +11,7 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/html/images/urlfilter/copy.gif var/ipfire/general-functions.pl var/ipfire/extrahd/bin/extrahd.pl +usr/local/bin/timectrl usr/local/bin/rebuild-initrd usr/local/bin/scanhd usr/local/sbin/setup diff --git a/config/time/counter.conf b/config/time/counter.conf new file mode 100644 index 0000000000..c77754a6e8 --- /dev/null +++ b/config/time/counter.conf @@ -0,0 +1 @@ +1435 diff --git a/config/time/enable b/config/time/enable new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/time/settime.conf b/config/time/settime.conf new file mode 100644 index 0000000000..9effa5808d --- /dev/null +++ b/config/time/settime.conf @@ -0,0 +1 @@ +0.ipfire.pool.ntp.org 1.ipfire.pool.ntp.org diff --git a/config/time/settings b/config/time/settings new file mode 100644 index 0000000000..f60ff45b98 --- /dev/null +++ b/config/time/settings @@ -0,0 +1,9 @@ +UPDATE_VALUE=1 +ENABLENTP=on +VALID=yes +ENABLECLNTP=off +ENABLESETONBOOT=on +NTP_ADDR_2=1.ipfire.pool.ntp.org +NTP_ADDR_1=0.ipfire.pool.ntp.org +UPDATE_PERIOD=daily +UPDATE_METHOD=periodically diff --git a/html/cgi-bin/time.cgi b/html/cgi-bin/time.cgi index c68eb999fd..caa17181ba 100644 --- a/html/cgi-bin/time.cgi +++ b/html/cgi-bin/time.cgi @@ -174,8 +174,8 @@ if ($timesettings{'VALID'} eq '') $timesettings{'UPDATE_METHOD'} = 'manually'; $timesettings{'UPDATE_VALUE'} = '1'; $timesettings{'UPDATE_PERIOD'} = 'daily'; - $timesettings{'NTP_ADDR_1'} = 'de.pool.ntp.org'; - $timesettings{'NTP_ADDR_2'} = 'pool.ntp.org'; + $timesettings{'NTP_ADDR_1'} = '0.ipfire.pool.ntp.org'; + $timesettings{'NTP_ADDR_2'} = '1.ipfire.pool.ntp.org'; $timesettings{'ENABLESETONBOOT'} = 'off'; } diff --git a/lfs/ntp b/lfs/ntp index 9bfe9d0175..1859212f52 100644 --- a/lfs/ntp +++ b/lfs/ntp @@ -81,5 +81,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) echo "server 127.127.1.0" >> /etc/ntp.conf echo "fudge 127.127.1.0 stratum 10" >> /etc/ntp.conf echo "driftfile /etc/ntp/drift" >> /etc/ntp.conf + + #Enable it by default... + cp -vf $(DIR_SRC)/config/time/* /var/ipfire/time/ + chmod 644 /var/ipfire/time/* + chown nobody:nobody /var/ipfire/time/* + ln -s ../init.d/ntp /etc/rc.d/rc0.d/K46ntpd + ln -s ../init.d/ntp /etc/rc.d/rc6.d/K46ntpd + ln -s ../init.d/ntp /etc/rc.d/rc3.d/S26ntpd + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/misc-progs/timectrl.c b/src/misc-progs/timectrl.c index f09e641b30..48b0978d78 100644 --- a/src/misc-progs/timectrl.c +++ b/src/misc-progs/timectrl.c @@ -36,7 +36,7 @@ int main(int argc, char *argv[]) { safe_system("/etc/rc.d/init.d/ntp start"); } else if (strcmp(argv[1], "disable") == 0) { safe_system("/etc/rc.d/init.d/ntpd stop"); - safe_system("rm -f /etc/rc.d/rc*.d/*ntp >/dev/null 2>&1"); + safe_system("rm -f /etc/rc.d/rc*.d/*ntpd >/dev/null 2>&1"); } else { fprintf(stderr, "\nBad argument given.\n\ntimectrl (start|stop|restart)\n\n"); exit(1); -- 2.39.2