From f13f3902997712ce884b58e437840822b36d96cf Mon Sep 17 00:00:00 2001 From: Greg Price Date: Sat, 25 Oct 2008 16:54:19 -0400 Subject: [PATCH] shorten sipb-xen-iptables initscript with std-init.sh svn path=/trunk/packages/sipb-xen-iptables/; revision=1253 --- debian/changelog | 165 ++--------------------------------------- debian/sipb-xen-iptables.init | 98 ++---------------------- 2 files changed, 16 insertions(+), 247 deletions(-) diff --git a/debian/changelog b/debian/changelog index f8f2608..f968b5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,166 +1,17 @@ -sipb-xen-www (3.17) unstable; urgency=low +sipb-xen-iptables (3) unstable; urgency=low - [ Quentin Smith ] - * Add Kerberos-authenticated web interface on port 442 + * shorten initscript with std-init.sh - [ Evan Broder ] - * Add config-package-dev to the build dependencies + -- Greg Price Sat, 25 Oct 2008 15:35:09 -0400 - -- Evan Broder Fri, 24 Oct 2008 15:32:34 -0400 +sipb-xen-iptables (2) unstable; urgency=low -sipb-xen-www (3.16) unstable; urgency=low + * invirt-configurize sipb-xen-iptables - * Shorten initscript with spiffy new library from sipb-xen-base - * Fix comment copy-paste error in initscript, now that it's mostly comments + -- Evan Broder Sun, 05 Oct 2008 01:22:25 -0400 - -- Greg Price Fri, 24 Oct 2008 07:19:13 -0400 - -sipb-xen-www (3.15) unstable; urgency=low - - * Use /etc/invirt/keytab instead of a separate keytab for apache - - -- Evan Broder Sun, 19 Oct 2008 19:56:04 -0400 - -sipb-xen-www (3.14.4) unstable; urgency=low - - * allow '*' wildcard in config.errormail_exclude - - -- Greg Price Sat, 11 Oct 2008 17:32:42 -0700 - -sipb-xen-www (3.14.3) unstable; urgency=low - - * Actually stop Apache on shutdown - - -- Evan Broder Sun, 05 Oct 2008 00:24:40 -0400 - -sipb-xen-www (3.14.2) unstable; urgency=low - - * Be a good debian package and undo what you did on uninstall - - -- Evan Broder Sun, 05 Oct 2008 00:06:30 -0400 - -sipb-xen-www (3.14.1) unstable; urgency=low - - * Try again, now that I actually understand what the problem is - - -- Evan Broder Sat, 04 Oct 2008 23:58:46 -0400 - -sipb-xen-www (3.14) unstable; urgency=low - - * Try to fix startup ordering problem by specifying that the new startup - script depends on $remote_fs - - -- Evan Broder Sat, 04 Oct 2008 23:32:14 -0400 - -sipb-xen-www (3.13.1) unstable; urgency=low - - * Don't add another Listen 443 directive - apache gets angry - * And this, kids, is why you should always test your code before - committing - - -- Evan broder Fri, 03 Oct 2008 22:01:22 -0400 - -sipb-xen-www (3.13) unstable; urgency=low - - * Make sure we're listening on all the necessary ports - - -- Evan Broder Fri, 03 Oct 2008 21:40:47 -0400 - -sipb-xen-www (3.12) unstable; urgency=low - - * invirt-confiscate the SVN checkout - - -- Evan Broder Fri, 03 Oct 2008 21:01:33 -0400 - -sipb-xen-www (3.11) unstable; urgency=low - - * fix distribution - - -- Greg Price Tue, 30 Sep 2008 23:48:37 -0400 - -sipb-xen-www (3.10) hardy; urgency=low - - * depend on debathena-afs-config and python-flup - - -- Greg Price Mon, 29 Sep 2008 05:58:01 +0000 - -sipb-xen-www (3.9) unstable; urgency=low - - * further integration of invirt.config - - -- Yang Zhang Fri, 8 Aug 2008 02:39:15 -0400 - -sipb-xen-www (3.8) unstable; urgency=low - - * sipb_xen_database -> invirt.database in cache_acls.py - - -- Yang Zhang Sun, 3 Aug 2008 19:45:19 -0400 - -sipb-xen-www (3.7) unstable; urgency=low - - uncommitted changes in /etc/apache2 on xvm.mit.edu: - * rewrite static/ uris for admin mode - * allow ~ uris - - * take instance from keytab in k5start apache2.init wrapper - - -- Greg Price Mon, 4 Aug 2008 01:22:47 -0400 - -sipb-xen-www (3.6) unstable; urgency=low - - * Add Anders' kstart-using apache2 init script. - * Add some dependencies the svn site needs. - * Use daemon/xvm-2.mit.edu for svn site, as it's on xvm-2 now - - -- Greg Price Fri, 1 Aug 2008 20:23:50 -0400 - -sipb-xen-www (3.5) unstable; urgency=low - - * Use FCGI. - * Lengthen timeouts to let the autoinstaller work. - - -- Greg Price Sun, 15 Jun 2008 21:51:59 -0400 - -sipb-xen-www (3.4) unstable; urgency=low - - * xvm.mit.edu rather than sipb-xen-dev.mit.edu - - -- Greg Price Sun, 11 May 2008 00:49:58 -0400 - -sipb-xen-www (3.3) unstable; urgency=low - - * Fix the SVN server to point to the new AFS mountpoint - - -- Evan Broder Fri, 9 May 2008 02:37:21 -0400 - -sipb-xen-www (3.2) unstable; urgency=low - - * Check in (part of?) the Apache config. - * Modify it to allow an informative front page without certs. - * Add that front page. - - -- Greg Price Fri, 9 May 2008 02:11:04 -0400 - -sipb-xen-www (3.1) unstable; urgency=low - - * Fixed the crontab definition - - -- SIPB Xen Project Mon, 31 Mar 2008 05:49:32 -0400 - -sipb-xen-www (3) unstable; urgency=low - - * Refresh the ACL cache every 5 minutes - - -- SIPB Xen Project Mon, 31 Mar 2008 05:38:16 -0400 - -sipb-xen-www (2) unstable; urgency=low - - * Create sipb-xen group in preinst script. - - -- Eric Price Sat, 29 Mar 2008 18:45:02 -0400 - -sipb-xen-www (1) unstable; urgency=low +sipb-xen-iptables (1) unstable; urgency=low * Initial Release. - -- SIPB Xen Project Fri, 28 Mar 2008 22:43:12 -0500 + -- SIPB Xen Project Fri, 28 Mar 2008 21:22:12 -0500 diff --git a/debian/sipb-xen-iptables.init b/debian/sipb-xen-iptables.init index 1c8d933..e9337c1 100755 --- a/debian/sipb-xen-iptables.init +++ b/debian/sipb-xen-iptables.init @@ -9,108 +9,26 @@ # Description: ### END INIT INFO -# Author: SIPB Xen Project - -# Do NOT "set -e" - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Load the sipb-xen iptables rules" NAME=sipb-xen-iptables +DESC="Load the sipb-xen iptables rules" RULES=/usr/share/sipb-xen-iptables/iptables.rules +GEN_FILES=$RULES +PATH=/sbin:/usr/sbin:/bin:/usr/bin -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh +dpkg -s "$NAME" >/dev/null 2>/dev/null || exit 0 -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -. /lib/lsb/init-functions +. /lib/init/gen-files.sh +. /lib/init/std-init.sh -# -# Function that starts the daemon/service -# do_start() { - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - for i in /usr/share/sipb-xen-iptables/iptables.rules - do mako-render $i.mako > $i - done - + gen_files /sbin/iptables-restore < $RULES } -# -# Function that stops the daemon/service -# do_stop() { - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred return 0 } -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: +std_init "$1" -- 1.7.9.5