[Mpuls-commits] r2421 - wasko/branches/2.0

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-04-20 08:49:34 +0200 (Tue, 20 Apr 2010)
New Revision: 2421

Modified:
   wasko/branches/2.0/INSTALL
Log:
* INSTALL: Added some more information on installation


Modified: wasko/branches/2.0/INSTALL
===================================================================
--- wasko/branches/2.0/INSTALL	2010-04-19 14:42:00 UTC (rev 2420)
+++ wasko/branches/2.0/INSTALL	2010-04-20 06:49:34 UTC (rev 2421)
@@ -31,37 +31,55 @@
 	https://svn.wald.intevation.org/svn/mpuls/wasko/branches/2.0 mpulsweb
 
 2. Installation
+
+	The server can be run in 3 ways. In general the three ways differ in
+	the way the user credentinals to connect to the database are provided.
+	In general the crededtionals can be provided in a configuration file,
+	or within the SSL-Client certificate. The latter needs a apache server
+	involved which can extract these information from the SSL-Client
+	certifiacte. If a database name is configured in the "ini" file it
+	will be taken for the connection. Leave the databasename blank, to let
+	the serve look for the credentionals in the HTTP-Headers.
+
+	2.1 Standalone paster server
+	The credetionals are provided in the "ini" file.
 	
-	cd mpulsweb
-	cp development.ini wasko.ini
-	# Configure wasko.ini for for needs. See details below
-	paster serve wasko.ini
-	
-	-> Server is up and running. :)
+		cd mpulsweb
+		cp development.ini wasko.ini
+		# Configure wasko.ini for for needs. See details below
+		paster serve wasko.ini
+		-> Server is up and running. :)
 
+	2.2 Standalone paster server behind a apache reverse proxy.
+	The credentionals are taken from the SSL-certificate and are added 
+	to the HTTP-Header. Setup a stand alone server as described above.
+	Use 'contrib/apache/apache-site-proxy.conf' as base for your
+	configuration of your apache server.
 
+	2.3 As WSGI application in Apache (mod_wsgi)
+	The credentionals are taken from the SSL-certificate and are added 
+	to the HTTP-Header.
+	Use 'contrib/apache/apache-site-wsgi.conf' and
+	'contrib/apache/mpuls.wsgi' as base for your apache configuration.
+
+
 CONFIGURATION
 =============
 
-WASKO
------
 1. In the ini file:
 
-	mpuls.app.name="WASKO" <- Choose whatever you want
+	# Choose whatever you want
+	mpuls.app.name="MY MPULS APP"
+	# Give name of the configuration file. 
 	mpuls.app.config=%(here)s/wasko.json
-	mpuls.app.instance=waskaweb
-	mpuls.app.indexcontroller=waska
+	# Choose the correct foldername where your application is located 
+	mpuls.app.instance=mympuls 
+	mpuls.app.indexcontroller=mpuls
 
-	* Setup database connection!
+	* Setup database connection. Only define databasename if you do not
+	  want the databasename comming from the SSL-certificate! 
 
-2. Temporary workaround to make i18n work
-
-	cd mpulsweb
-	ln -s ../waskaweb/i18n .
-	cd ..
-	python setup.py compile_catalog
-
-3. Currently there are no more modifications needed. wasko.json already is
+2. Currently there are no more modifications needed. wasko.json already is
 ready to run.