From 061d4b77b10dea6c899cde3b1abc694155d67a09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Schneider?= Date: Fri, 13 Jan 2012 18:55:05 +0100 Subject: [PATCH] Add a config example and use this conf in debian package * debian/postinst: modify /var/lib/wcs-asec owner * debian/rules: create /var/lib/wcs-asec and add config file * debian/wcs-asec.init: manage config file * wcs-asec.cfg-sample: config file example --- debian/postinst | 1 + debian/rules | 3 +++ debian/wcs-asec.init | 17 +++++++++++++---- wcs-asec.cfg-sample | 9 +++++++++ 4 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 wcs-asec.cfg-sample diff --git a/debian/postinst b/debian/postinst index 78eff83..675ace5 100644 --- a/debian/postinst +++ b/debian/postinst @@ -8,6 +8,7 @@ case "$1" in adduser --disabled-password --quiet --system \ --home /var/lib/wcs-asec --no-create-home\ --gecos "w.c.s. asec" --group wcs-asec + chown wcs-asec: /var/lib/wcs-asec fi ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/rules b/debian/rules index 7d60b4c..b5fdac2 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,7 @@ #export DH_VERBOSE=1 PYTHON=/usr/bin/python +DESTDIR=$(CURDIR)/debian/wcs-asec build: build-stamp @@ -34,6 +35,8 @@ install: build mv $$i/site-packages/extra \ $$i/site-packages/extra-wcs-asec; done cd po && make install prefix=$(CURDIR)/debian/wcs-asec/ + install -d -m 755 $(DESTDIR)/var/lib/wcs-asec $(DESTDIR)/etc/wcs + install -m 644 wcs-asec.cfg-sample $(DESTDIR)/etc/wcs/wcs-asec.cfg # Build architecture-independent files here. diff --git a/debian/wcs-asec.init b/debian/wcs-asec.init index 101666b..133b118 100755 --- a/debian/wcs-asec.init +++ b/debian/wcs-asec.init @@ -15,9 +15,12 @@ NAME=wcs-asec DAEMON=/usr/sbin/wcsctl PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME -OPTIONS="--extra /usr/share/pyshared/extra-wcs-asec/" +PYTHON_VERSION=`/usr/bin/env python -c \ + "import sys; print '%d.%d' % (sys.version_info[0], sys.version_info[1])"` +OPTIONS="--extra /usr/lib/pymodules/python$PYTHON_VERSION/extra-wcs-asec/" WCS_USER=wcs-asec WCS_GROUP=wcs-asec +CONFIG_FILE=/etc/wcs/wcs-asec.cfg # Gracefully exit if the package has been removed. test -x $DAEMON || exit 0 @@ -32,9 +35,15 @@ fi # Function that starts the daemon/service. # d_start() { - start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --chuid $WCS_USER:$WCS_GROUP \ - --make-pidfile --background --exec $DAEMON -- start $OPTIONS + if [ $CONFIG_FILE ]; then + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --chuid $WCS_USER:$WCS_GROUP --make-pidfile --background \ + --exec $DAEMON -- -f $CONFIG_FILE start $OPTIONS + else + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --chuid $WCS_USER:$WCS_GROUP --make-pidfile --background \ + --exec $DAEMON -- start $OPTIONS + fi } # diff --git a/wcs-asec.cfg-sample b/wcs-asec.cfg-sample new file mode 100644 index 0000000..bbbd21d --- /dev/null +++ b/wcs-asec.cfg-sample @@ -0,0 +1,9 @@ +[main] +app_dir = /var/lib/wcs-asec +data_dir = /usr/share/wcs +# Automatically create virtual host +auto_create_appdir = true +use_long_traces = true +#error_log = /var/lib/wcs-au-quotidien/error.log +# Redirect on unknown virtual host +#missing_appdir_redirect = http://www.mysite.com