Changeset 269

Timestamp:

Feb 24, 2008, 10:34:49 PM (16 years ago)

Author:

broder

Message:

Created init scripts and moved dnsserver.py script into sipb-xen-dns package

Location:

trunk

Files:

• dns (deleted)
• packages/sipb-xen-dns/code (added)
• packages/sipb-xen-dns/code/dnsserver.py (copied) (copied from trunk/dns/dnsserver.py)
• packages/sipb-xen-dns/debian/control (modified) (1 diff)
• packages/sipb-xen-dns/debian/rules (modified) (1 diff)
• packages/sipb-xen-dns/debian/sipb-xen-dns.init (modified) (3 diffs)

trunk/packages/sipb-xen-dns/debian/control

@@ -8 +8 @@
 Package: sipb-xen-dns
 Architecture: all
-Depends: ${misc:Depends}, 
-Description: Base configuration required for all SIPB xen servers
- This package includes apt configuration, .k5login and other files that
- should be synchronized among all our servers.
- Installing this on a non-sipb-xen machine would be very anti-social.
+Depends: ${misc:Depends}, daemon
+Description: Install and enable the DNS server

trunk/packages/sipb-xen-dns/debian/rules

@@ -4 +4 @@
 
 binary-fixup/sipb-xen-dns::
-        svn co file:///mit/sipb-xen/svn/trunk/dns/ $(DEB_DESTDIR)/usr/local/lib/sipb-xen-dns
+        svn co file:///mit/sipb-xen/svn/trunk/packages/sipb-xen-dns/code/ $(DEB_DESTDIR)/usr/local/lib/sipb-xen-dns

trunk/packages/sipb-xen-dns/debian/sipb-xen-dns.init

@@ -19 +19 @@
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Description of the service"
-NAME=daemonexecutablename
-DAEMON=/usr/sbin/$NAME
-DAEMON_ARGS="--options args"
+DESC="The sipb-xen DNS server"
+NAME=sipb-xen-dns
+DAEMON=/usr/local/lib/sipb-xen-dns/dnsserver.py
+DAEMON_ARGS=""
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
@@ -48 +48 @@
         #   1 if daemon was already running
         #   2 if daemon could not be started
-        start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-                || return 1
-        start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-                $DAEMON_ARGS \
-                || return 2
-        # Add code here, if necessary, that waits for the process to be ready
-        # to handle requests from services started subsequently which depend
-        # on this one.  As a last resort, sleep for some time.
+        daemon --running -n $NAME && return 1
+        daemon -r -n $NAME -U $DAEMON $DAEMON_ARGS || return 2
 }
 
@@ -68 +62 @@
         #   2 if daemon could not be stopped
         #   other if a failure occurred
-        start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
+        daemon --stop -n $NAME
         RETVAL="$?"
         [ "$RETVAL" = 2 ] && return 2
-        # Wait for children to finish too if this is a daemon that forks
-        # and if the daemon is only ever run from this initscript.
-        # If the above conditions are not satisfied then add some other code
-        # that waits for the process to drop all resources that could be
-        # needed by services started subsequently.  A last resort is to
-        # sleep for some time.
-        start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-        [ "$?" = 2 ] && return 2
         # Many daemons don't delete their pidfiles when they exit.
         rm -f $PIDFILE
         return "$RETVAL"
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
-        #
-        # If the daemon can reload its configuration without
-        # restarting (for example, when it is sent a SIGHUP),
-        # then implement that here.
-        #
-        start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
-        return 0
 }