[Osaas-commits] r56 - in trunk: . contrib

[scm-commit@wald.intevation.org]

Author: sholl
Date: 2008-12-22 14:09:48 +0100 (Mon, 22 Dec 2008)
New Revision: 56

Modified:
   trunk/ChangeLog
   trunk/contrib/README.txt
   trunk/contrib/osaas
Log:
	* contrib/osaas, contrib/README.txt: Added a more specific
	  hint about the configuration file for the startup-script.
	  Added a variable for the osaas-user who runs the server in a
	  RPM-based installation. This closes bug #844



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-12-22 11:26:34 UTC (rev 55)
+++ trunk/ChangeLog	2008-12-22 13:09:48 UTC (rev 56)
@@ -1,5 +1,12 @@
 2008-12-22  Stephan Holl  <stephan.holl at intevation.de>
 
+	* contrib/osaas, contrib/README.txt: Added a more specific
+	  hint about the configuration file for the startup-script.
+	  Added a variable for the osaas-user who runs the server in a
+	  RPM-based installation. This closes bug #844
+
+2008-12-22  Stephan Holl  <stephan.holl at intevation.de>
+
 	* contrib/osaas: Fixed bug #839: status is now recognized.
 
 2008-12-03  Stephan Holl  <stephan.holl at intevation.de>

Modified: trunk/contrib/README.txt
===================================================================
--- trunk/contrib/README.txt	2008-12-22 11:26:34 UTC (rev 55)
+++ trunk/contrib/README.txt	2008-12-22 13:09:48 UTC (rev 56)
@@ -4,6 +4,13 @@
 osaas:  This is a SuSE-specific init-script which adds the possibility to
         start and stop OSAAS-server as a service. You can manually copy it to
         /etc/init.d/ and set the propper links to the runlevels you want
-        to start the OSAAS-server.
+        to start the OSAAS-server. By default this script requires an
+        osaas-user to run under.
 
         Make sure that the script has the executable-permissions set.
+        
+        The startup-script requires a configuration-file
+        /etc/osaas/osaas-config.xml to work properly.
+
+        When using OSAAS-server from within a RPM-package this is
+        automatically setup correct.

Modified: trunk/contrib/osaas
===================================================================
--- trunk/contrib/osaas	2008-12-22 11:26:34 UTC (rev 55)
+++ trunk/contrib/osaas	2008-12-22 13:09:48 UTC (rev 56)
@@ -25,6 +25,7 @@
 OSAAS_PID=/opt/gispatcher/osaas-server/osaas.pid
 OSAAS_CONFIG=/etc/osaas/osaas-config.xml
 test -f $OSAAS_CONFIG || exit 5
+OSAAS_USER=osaas
 
 # Shell functions sourced from /etc/rc.status:
 #      rc_check         check and set local and overall rc status
@@ -64,7 +65,7 @@
 	# NOTE: startproc return 0, even if service is 
 	# already running to match LSB spec.
 	#startproc -u osaas -g osaas -p $OSAAS_PID -t 1 $OSAAS_BIN --config-file=${OSAAS_CONFIG} >/dev/null 2>&1  
-	su osaas -c "$OSAAS_BIN --config-file=${OSAAS_CONFIG} --pid-file=${OSAAS_PID} >/dev/null 2>&1 & "
+	su $OSAAS_USER -c "$OSAAS_BIN --config-file=${OSAAS_CONFIG} --pid-file=${OSAAS_PID} >/dev/null 2>&1 & "
 
 	# Remember status and be verbose
 	rc_status -v