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

[scm-commit@wald.intevation.org]

Author: sholl
Date: 2009-03-15 13:04:43 +0100 (Sun, 15 Mar 2009)
New Revision: 59

Modified:
   trunk/ChangeLog
   trunk/packaging/debian/changelog
   trunk/packaging/debian/init.d
   trunk/server/demo-config.xml
Log:
	* packaging/debian/changelog: updated revision-number
	* packaging/debian/init.d: made stop-target more robust, fixed a
	  bug in the start-target
	* server/demo-config.xml: set the logging-path to /var/log/osaas/
	  instead of /var/log; this fixes permission problems.



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-03-12 18:09:17 UTC (rev 58)
+++ trunk/ChangeLog	2009-03-15 12:04:43 UTC (rev 59)
@@ -1,3 +1,11 @@
+2009-03-15  Stephan Holl  <stephan.holl at intevation.de>
+
+	* packaging/debian/changelog: updated revision-number
+	* packaging/debian/init.d: made stop-target more robust, fixed a
+	  bug in the start-target
+	* server/demo-config.xml: set the logging-path to /var/log/osaas/
+	  instead of /var/log; this fixes permission problems.
+
 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

Modified: trunk/packaging/debian/changelog
===================================================================
--- trunk/packaging/debian/changelog	2009-03-12 18:09:17 UTC (rev 58)
+++ trunk/packaging/debian/changelog	2009-03-15 12:04:43 UTC (rev 59)
@@ -1,3 +1,10 @@
+osaas (1.1.0-3) unstable; urgency=low
+
+  * Updated the init-script and made the stop-target more robust
+
+
+ -- Stephan Holl <stephan.holl at intevation.de>  Sun, 15 Mar 2009 12:59:33 +0100
+
 osaas (1.1.0-2) unstable; urgency=low
 
   * Fixed a bug in the preinst-script which prevents creating the system-user

Modified: trunk/packaging/debian/init.d
===================================================================
--- trunk/packaging/debian/init.d	2009-03-12 18:09:17 UTC (rev 58)
+++ trunk/packaging/debian/init.d	2009-03-15 12:04:43 UTC (rev 59)
@@ -41,8 +41,8 @@
   start)
         if "$OSAAS_RUN"; then
 	    echo -n "Starting $DESC: "
-	    start-stop-daemon --start -c $OSAAS_USER:$OSAAS_GROUP --quiet --pidfile $OSAAS_PID \
-	    	--exec $DAEMON -- 
+	    start-stop-daemon --start -c $OSAAS_USER:$OSAAS_GROUP --quiet -b --pidfile $OSAAS_PID  \
+	    	--exec $DAEMON -- --config-file=$CONFIG_FILE --pid-file=$OSAAS_PID
 	    echo "$NAME."
         else
             echo  "Please configure OSAAS and set the value OSAAS_RUN in /etc/default/osaas-server appropriate."
@@ -52,8 +52,7 @@
   stop)
         if "$OSAAS_RUN"; then
 	    echo -n "Stopping $DESC: "
-	    start-stop-daemon --stop -c $OSAAS_USER:$OSAAS_GROUP --quiet --pidfile $OSAAS_PID \
-		--exec $DAEMON
+	    kill -TERM `cat $OSAAS_PID`
 	    echo "$NAME."
         else
             echo  "Please configure OSAAS and set the value OSAAS_RUN in /etc/default/osaas-server appropriate."
@@ -68,22 +67,20 @@
 	#   daemon isn't already running.
 	# check wether $DAEMON is running. If so, restart
 	start-stop-daemon --stop -c $OSAAS_USER:$OSAAS_GROUP --test --quiet --pidfile \
-		$OSAAS_PID --exec $DAEMON \
+		$OSAAS_PID --exec $DAEMON -- --config-file=$CONFIG_FILE --pid-file=$OSAAS_PID\
 	&& $0 restart \
 	|| exit 0
 	;;
   restart)
-    echo -n "Restarting $DESC: "
-	start-stop-daemon --stop -c $OSAAS_USER:$OSAAS_GROUP --quiet --pidfile \
-		$OSAAS_PID --exec $DAEMON
+    echo -n "Restarting $DESC: "  
+	kill -TERM `cat $OSAAS_PID`
 	sleep 1
-	start-stop-daemon --start -c $OSAAS_USER:$OSAAS_GROUP --quiet --pidfile \
-		$OSAAS_PID --exec $DAEMON --
+	start-stop-daemon --start -c $OSAAS_USER:$OSAAS_GROUP --quiet -b --pidfile \
+		$OSAAS_PID --exec $DAEMON -- --config-file=$CONFIG_FILE --pid-file=$OSAAS_PID
 	echo "$NAME."
 	;;
   *)
 	N=/etc/init.d/$NAME
-	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
 	echo "Usage: $N {start|stop|restart|force-reload}" >&2
 	exit 1
 	;;

Modified: trunk/server/demo-config.xml
===================================================================
--- trunk/server/demo-config.xml	2009-03-12 18:09:17 UTC (rev 58)
+++ trunk/server/demo-config.xml	2009-03-15 12:04:43 UTC (rev 59)
@@ -12,8 +12,8 @@
            CRITICAL, ERROR, WARNING, INFO, DEBUG
        Default log level is INFO.
     -->
-  <AccessLog>/var/log/osaas-access.log</AccessLog>
-  <ErrorLog>/var/log/osaas-error.log</ErrorLog>
+  <AccessLog>/var/log/osaas/osaas-access.log</AccessLog>
+  <ErrorLog>/var/log/osaas/osaas-error.log</ErrorLog>
   <LogLevel>INFO</LogLevel>
 
   <!-- The users database file. -->