[Osaas-commits] r61 - in trunk: . server

[scm-commit@wald.intevation.org]

Author: sholl
Date: 2009-09-18 13:19:26 +0200 (Fri, 18 Sep 2009)
New Revision: 61

Modified:
   trunk/ChangeLog
   trunk/server/demo-config.xml
Log:
	* server/demo-config.xml: corrected path to default
	  osaas-users-file. Added 'port' and 'dbname' to
	  postgresql-config-parameter.



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-09-18 11:14:41 UTC (rev 60)
+++ trunk/ChangeLog	2009-09-18 11:19:26 UTC (rev 61)
@@ -1,3 +1,9 @@
+2009-09-18  Stephan Holl  <stephan.holl at intevation.de>
+
+	* server/demo-config.xml: corrected path to default
+	  osaas-users-file. Added 'port' and 'dbname' to
+	  postgresql-config-parameter.
+
 2009-04-06  Stephan Holl  <stephan.holl at intevation.de>
 
 	* packaging/debian/preinst: added test which avoids creating

Modified: trunk/server/demo-config.xml
===================================================================
--- trunk/server/demo-config.xml	2009-09-18 11:14:41 UTC (rev 60)
+++ trunk/server/demo-config.xml	2009-09-18 11:19:26 UTC (rev 61)
@@ -17,7 +17,7 @@
   <LogLevel>INFO</LogLevel>
 
   <!-- The users database file. -->
-  <UserDB>/etc/osaas-users</UserDB>
+  <UserDB>/etc/osaas/osaas-users</UserDB>
 
   <!-- File in which to write the PID.  Useful for /etc/init.d scripts -->
   <PidFile>/var/run/osaas.pid</PidFile>
@@ -28,7 +28,7 @@
     <Type>postgresql</Type>
 
     <!-- Connection parameters as a single string.  Use this for postgresql. -->
-    <Parameters>user=mydbuser password=mydbpassword host=localhost</Parameters>
+    <Parameters>user=mydbuser password=mydbpassword host=localhost port=myport dbname=mydb</Parameters>
 
     <!-- Connection parameters for Oracle.  Make sure Parameters is
 	 empty or not present at all when using oracle.  The Parameters