From 96297aceb23c9363c37c27795253c35c431730f2 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Fri, 24 Oct 2008 07:27:43 -0400 Subject: [PATCH] shorten sipb-xen-www initscript with new library svn path=/trunk/packages/sipb-xen-www/; revision=1215 --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/sipb-xen-www.init | 29 +++++------------------------ 3 files changed, 13 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index e510062..2f2e539 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +sipb-xen-www (3.16) unstable; urgency=low + + * Shorten initscript with spiffy new library from sipb-xen-base + * Fix comment copy-paste error in initscript, now that it's mostly comments + + -- 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 diff --git a/debian/control b/debian/control index 7d018bc..714343f 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,6 @@ Standards-Version: 3.7.2 Package: sipb-xen-www Architecture: all -Depends: ${misc:Depends}, libapache2-mod-fcgid, python-flup, python-cheetah, python-simplejson, sipb-xen-database-common, sipb-xen-vnc-client, kstart, debathena-afs-config, +Depends: ${misc:Depends}, libapache2-mod-fcgid, python-flup, python-cheetah, python-simplejson, sipb-xen-database-common, sipb-xen-vnc-client, kstart, debathena-afs-config, sipb-xen-base, libapache2-svn, postfix, subversion, zephyr-clients Description: Install the sipb-xen-dev website diff --git a/debian/sipb-xen-www.init b/debian/sipb-xen-www.init index 20bc191..f13ab6d 100755 --- a/debian/sipb-xen-www.init +++ b/debian/sipb-xen-www.init @@ -5,32 +5,13 @@ # Required-Stop: $local_fs $remote_fs # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: conserver config from invirt config for invirt host +# Short-Description: sipb-xen web server # Description: ### END INIT INFO PACKAGE=sipb-xen-www +PARENTPACKAGE=apache2 +GEN_FILES=(/etc/apache2/sites-available/{ssl,svn}) -. /lib/lsb/init-functions - -gen_config() -{ - for i in /etc/apache2/sites-available/{ssl,svn} - do mako-render $i.mako > $i - done -} - -case "$1" in - start|reload|force-reload|restart) - log_begin_msg "Reloading config for $PACKAGE" - gen_config - log_end_msg $? - /etc/init.d/apache2 "$1" - ;; - stop) - /etc/init.d/apache2 "$1" - ;; - *) - log_success_msg "Usage: /etc/init.d/$PACKAGE {start|reload|force-reload|restart|stop}" - ;; -esac +. /lib/init/config-init.sh +config_init "$1" -- 1.7.9.5