[Lunar-commits] r14867 - in moonbase/trunk/net/ntp: . init.d

[Moritz Heiber]

Author: moe
Date: 2005-05-20 11:49:46 +0000 (Fri, 20 May 2005)
New Revision: 14867

Added:
   moonbase/trunk/net/ntp/ntp.conf
Modified:
   moonbase/trunk/net/ntp/BUILD
   moonbase/trunk/net/ntp/init.d/ntpd
Log:
* Added a good default configuration for ntp. pool.ntp.org is open to
  anyone running on round-robin dns.
* Make use of the new gather_docs directory feature to get the html
  docs for ntp (doesn't do any harm if somebody doesn't have the latest
  coretools installed)
* Exchange -f in favour of -e as the configuration file might actually
  be a link



Modified: moonbase/trunk/net/ntp/BUILD
===================================================================
--- moonbase/trunk/net/ntp/BUILD	2005-05-20 11:48:44 UTC (rev 14866)
+++ moonbase/trunk/net/ntp/BUILD	2005-05-20 11:49:46 UTC (rev 14867)
@@ -23,27 +23,11 @@
   if [ -e "/etc/rc?.d/*ntp.sh" ]; then
      rm -f /etc/rc?.d/*ntp.sh
   fi                                              &&
-
-  if [ ! -e /usr/share/doc/$MODULE ]; then
-     mkdir -p /usr/share/doc/$MODULE
-  fi                                              &&
   
-  cp -rvp html /usr/share/doc/$MODULE             &&
-  
-  if [ ! -e /etc/ntp.conf ]
-   then
-   cat > /etc/ntp.conf << EOF
-# refer to 
-# file:///usr/share/docs/$MODULE/html/config.html 
-# and
-# file:///usr/share/docs/$MODULE/html/confopt.htm 
-# or
-# http://www.eecis.udel.edu/~ntp/documentation.html 
+  gather_docs html &&
 
-logfile /var/log/ntp.log
-driftfile /var/state/ntp.drift
-
-EOF
-   fi
+  if [ ! -e /etc/ntp.conf ]; then
+    install -m644 $SCRIPT_DIRECTORY/ntp.conf /etc
+  fi
    
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/net/ntp/init.d/ntpd
===================================================================
--- moonbase/trunk/net/ntp/init.d/ntpd	2005-05-20 11:48:44 UTC (rev 14866)
+++ moonbase/trunk/net/ntp/init.d/ntpd	2005-05-20 11:49:46 UTC (rev 14867)
@@ -8,7 +8,7 @@
 # config: /etc/ntp.conf
 
 ARGS="-g"
-[ -f "/etc/ntp.conf" ] && ARGS="$ARGS -c /etc/ntp.conf"
+[ -e "/etc/ntp.conf" ] && ARGS="$ARGS -c /etc/ntp.conf"
 
 reload () {
 	# ntp is not reload-safe

Added: moonbase/trunk/net/ntp/ntp.conf
===================================================================
--- moonbase/trunk/net/ntp/ntp.conf	2005-05-20 11:48:44 UTC (rev 14866)
+++ moonbase/trunk/net/ntp/ntp.conf	2005-05-20 11:49:46 UTC (rev 14867)
@@ -0,0 +1,11 @@
+# By default, ntp uses a worldwide pool of servers scattered all
+# around the world. For a closer choice have a look at:
+# http://ntp.isc.org/bin/view/Servers/NTPPoolServers
+#
+# You might want to take a look at the documentation at:
+# http://ntp.isc.org/bin/view/Main/WebHome 
+
+servers pool.ntp.org
+
+logfile /var/log/ntp.log
+driftfile /var/state/ntp.drift