[Osaas-commits] r58 - in trunk: . packaging/debian

[scm-commit@wald.intevation.org]

Author: sholl
Date: 2009-03-12 19:09:17 +0100 (Thu, 12 Mar 2009)
New Revision: 58

Modified:
   trunk/ChangeLog
   trunk/packaging/debian/changelog
   trunk/packaging/debian/init.d
   trunk/packaging/debian/osaas-server.default
   trunk/packaging/debian/preinst
Log:
	* packaging/debian/preinst: Fixed a bug in the preinst-script which prevents creating the system-user
	  osaas with corresponding group; Added LSB-parameter to make Debian Lenny happy. Most information can be
	  found at http://wiki.debian.org/LSBInitScripts
	* packaging/debian/init.d, packaging/debian/osaas-server.default:
	  Fixed a bug in the startup-script regarding the default
	  configuration, added an option to not start OSAAS unless OSAAS_RUN
	  is set to true
	* packaging/debian/changelog: updated revision



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-12-22 16:31:33 UTC (rev 57)
+++ trunk/ChangeLog	2009-03-12 18:09:17 UTC (rev 58)
@@ -1,3 +1,14 @@
+2009-03-12  Stephan Holl  <stephan.holl at intevation.de>
+
+	* packaging/debian/preinst: Fixed a bug in the preinst-script which prevents creating the system-user
+	  osaas with corresponding group; Added LSB-parameter to make Debian Lenny happy. Most information can be
+	  found at http://wiki.debian.org/LSBInitScripts
+	* packaging/debian/init.d, packaging/debian/osaas-server.default:
+	  Fixed a bug in the startup-script regarding the default
+	  configuration, added an option to not start OSAAS unless OSAAS_RUN
+	  is set to true
+	* packaging/debian/changelog: updated revision
+
 2008-12-22  Stephan Holl  <stephan.holl at intevation.de>
 
 	* packaging/debian, packaging/debian/control,

Modified: trunk/packaging/debian/changelog
===================================================================
--- trunk/packaging/debian/changelog	2008-12-22 16:31:33 UTC (rev 57)
+++ trunk/packaging/debian/changelog	2009-03-12 18:09:17 UTC (rev 58)
@@ -1,3 +1,14 @@
+osaas (1.1.0-2) unstable; urgency=low
+
+  * Fixed a bug in the preinst-script which prevents creating the system-user
+    osaas with corresponding group.
+  * Added LSB-parameter to make Debian Lenny happy. Most information can be
+    found at http://wiki.debian.org/LSBInitScripts
+  * Fixed a bug in the startup-script regarding the default configuration,
+    added an option to not start OSAAS unless OSAAS_RUN is set to true
+
+ -- Stephan Holl <stephan.holl at intevation.de>  Thu, 12 Mar 2009 11:43:26 +0100
+
 osaas (1.1.0-1) unstable; urgency=low
 
   * Initial debianization of OSAAS

Modified: trunk/packaging/debian/init.d
===================================================================
--- trunk/packaging/debian/init.d	2008-12-22 16:31:33 UTC (rev 57)
+++ trunk/packaging/debian/init.d	2009-03-12 18:09:17 UTC (rev 58)
@@ -10,32 +10,55 @@
 # Version:	@(#)skeleton  1.9  26-Feb-2001  miquels at cistron.nl
 #
 
+### BEGIN INIT INFO
+# Provides:          osaas-server
+# Required-Start:    $local_fs $remote_fs $network
+# Required-Stop:     $local_fs $remote_fs $network
+# Should-Start:      $named
+# Should-Stop:       $named
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start OSAAS-Server.
+# Description:       Start the OSAAS-Server to log OWS-Requests in combination with deegree-owsproxy.
+### END INIT INFO
+
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/opt/gispatcher/osaas-server/server/startosaas.py
+OSAAS_RUN=false
 NAME=osaas
 DESC=OSAAS-Server
 
 test -x $DAEMON || exit 0
 
 # Include osaas defaults if available
-if [ -f /etc/default/osaas ] ; then
-	. /etc/default/osaas
+if [ -f /etc/default/osaas-server ] ; then
+	. /etc/default/osaas-server
 fi
 
 set -e
 
 case "$1" in
   start)
-	echo -n "Starting $DESC: "
-	start-stop-daemon --start -c $OSAAS_USER:$OSAAS_GROUP --quiet --pidfile $OSAAS_PID \
-		--exec $DAEMON -- 
-	echo "$NAME."
+        if "$OSAAS_RUN"; then
+	    echo -n "Starting $DESC: "
+	    start-stop-daemon --start -c $OSAAS_USER:$OSAAS_GROUP --quiet --pidfile $OSAAS_PID \
+	    	--exec $DAEMON -- 
+	    echo "$NAME."
+        else
+            echo  "Please configure OSAAS and set the value OSAAS_RUN in /etc/default/osaas-server appropriate."
+            exit 0
+        fi
 	;;
   stop)
-	echo -n "Stopping $DESC: "
-	start-stop-daemon --stop -c $OSAAS_USER:$OSAAS_GROUP --quiet --pidfile $OSAAS_PID \
+        if "$OSAAS_RUN"; then
+	    echo -n "Stopping $DESC: "
+	    start-stop-daemon --stop -c $OSAAS_USER:$OSAAS_GROUP --quiet --pidfile $OSAAS_PID \
 		--exec $DAEMON
-	echo "$NAME."
+	    echo "$NAME."
+        else
+            echo  "Please configure OSAAS and set the value OSAAS_RUN in /etc/default/osaas-server appropriate."
+            exit 0
+        fi
 	;;
   force-reload)
 	#

Modified: trunk/packaging/debian/osaas-server.default
===================================================================
--- trunk/packaging/debian/osaas-server.default	2008-12-22 16:31:33 UTC (rev 57)
+++ trunk/packaging/debian/osaas-server.default	2009-03-12 18:09:17 UTC (rev 58)
@@ -6,6 +6,9 @@
 # This is a POSIX shell fragment
 #
 
+# Start OSAAS by default?
+OSAAS_RUN=false
+
 # Daemon-path
 DAEMON="/opt/gispatcher/osaas-server/server/startosaas.py"
 

Modified: trunk/packaging/debian/preinst
===================================================================
--- trunk/packaging/debian/preinst	2008-12-22 16:31:33 UTC (rev 57)
+++ trunk/packaging/debian/preinst	2009-03-12 18:09:17 UTC (rev 58)
@@ -17,8 +17,8 @@
 case "$1" in
     install)
     # create users
-    groupadd -o -r osaas >/dev/null 2>&1 || :
-    useradd -M -g osaas -o -r -d /opt/gispatcher/osaas-server -s /bin/bash -c "OSAAS-Server " osaas >/dev/null 2>&1 || :
+    groupadd -r osaas >/dev/null 2>&1 || :
+    useradd -g osaas -r -d /opt/gispatcher/osaas-server -s /bin/bash -c "OSAAS-Server " osaas >/dev/null 2>&1 || :
     install -d /var/log/osaas
     install -d /opt/gispatcher/osaas-server
     chown osaas:osaas /var/log/osaas