[Osaas-commits] r49 - in trunk: . contrib server

[scm-commit@wald.intevation.org]

Author: sholl
Date: 2008-11-24 08:46:13 +0100 (Mon, 24 Nov 2008)
New Revision: 49

Modified:
   trunk/ChangeLog
   trunk/contrib/osaas
   trunk/server/demo-config.xml
Log:
	* contrib/osaas: added PID-parameter to reflect the PID-file of
	  osaas

	* server/demo-config.xml: fixed typo in PID-file-path



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-11-21 16:23:59 UTC (rev 48)
+++ trunk/ChangeLog	2008-11-24 07:46:13 UTC (rev 49)
@@ -1,3 +1,10 @@
+2008-11-24  Stephan Holl  <stephan.holl at intevation.de>
+
+	* contrib/osaas: added PID-parameter to reflect the PID-file of
+	  osaas
+
+	* server/demo-config.xml: fixed typo in PID-file-path
+
 2008-11-21  Bernhard Herzog  <bh at intevation.de>
 
 	First step towards implementing patch #801

Modified: trunk/contrib/osaas
===================================================================
--- trunk/contrib/osaas	2008-11-21 16:23:59 UTC (rev 48)
+++ trunk/contrib/osaas	2008-11-24 07:46:13 UTC (rev 49)
@@ -64,7 +64,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} >/dev/null 2>&1 & "
+	su osaas -c "$OSAAS_BIN --config-file=${OSAAS_CONFIG} --pid-file=${OSAAS_PID} >/dev/null 2>&1 & "
 
 	# Remember status and be verbose
 	rc_status -v

Modified: trunk/server/demo-config.xml
===================================================================
--- trunk/server/demo-config.xml	2008-11-21 16:23:59 UTC (rev 48)
+++ trunk/server/demo-config.xml	2008-11-24 07:46:13 UTC (rev 49)
@@ -14,7 +14,7 @@
   <UserDB>/etc/osaas-users</UserDB>
 
   <!-- File in which to write the PID.  Useful for /etc/init.d scripts -->
-  <PidFile>/va/run/osaas.pid</PidFile>
+  <PidFile>/var/run/osaas.pid</PidFile>
 
   <!-- The database connection parameters -->
   <DBConnection>