[Mpuls-commits] r4769 - in base/trunk: . contrib/apache

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2011-03-09 17:00:36 +0100 (Wed, 09 Mar 2011)
New Revision: 4769

Modified:
   base/trunk/ChangeLog
   base/trunk/contrib/apache/apache-site-wsgi.conf
   base/trunk/contrib/apache/mpuls.wsgi
Log:
Updated config files for production server (apache config, wsgi) script.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-03-09 09:10:30 UTC (rev 4768)
+++ base/trunk/ChangeLog	2011-03-09 16:00:36 UTC (rev 4769)
@@ -1,3 +1,8 @@
+2011-03-09  Torsten Irlaender <torsten at intevation.de>
+
+	* contrib/apache/mpuls.wsgi: Updated wsgi-script
+	* contrib/apache/apache-site-wsgi.conf: Updated apache-config
+
 2011-03-08  Torsten Irlaender <torsten at intevation.de>
 
 	* mpulsweb/templates/appointments/edit.mako,

Modified: base/trunk/contrib/apache/apache-site-wsgi.conf
===================================================================
--- base/trunk/contrib/apache/apache-site-wsgi.conf	2011-03-09 09:10:30 UTC (rev 4768)
+++ base/trunk/contrib/apache/apache-site-wsgi.conf	2011-03-09 16:00:36 UTC (rev 4769)
@@ -1,5 +1,5 @@
-NameVirtualHost *
-<VirtualHost *>
+NameVirtualHost *:443
+<VirtualHost *:443>
         ServerAdmin webmaster at localhost
 
         SSLEngine On
@@ -30,7 +30,7 @@
         WSGIProcessGroup www-data 
 
 	# Set correct path to the mpuls.wsgi script
-        WSGIScriptAlias / /usr/local/wsgi/scripts/mpuls.wsgi
+        WSGIScriptAlias / /home/mpuls/mpuls/mpuls.wsgi
 
         <Location />
 		# Please set correct SSL_CLIENT_S_DN_OU
@@ -80,12 +80,12 @@
                 Allow from all
         </Directory>
 
-        ErrorLog /var/log/apache2/error.log
+        ErrorLog /var/log/apache2/mpuls-error.log
 
         # Possible values include: debug, info, notice, warn, error, crit,
         # alert, emerg.
         LogLevel warn
 
-        CustomLog /var/log/apache2/access.log combined
+        CustomLog /var/log/apache2/mpuls-access.log combined
         ServerSignature On
 </VirtualHost>

Modified: base/trunk/contrib/apache/mpuls.wsgi
===================================================================
--- base/trunk/contrib/apache/mpuls.wsgi	2011-03-09 09:10:30 UTC (rev 4768)
+++ base/trunk/contrib/apache/mpuls.wsgi	2011-03-09 16:00:36 UTC (rev 4769)
@@ -6,20 +6,23 @@
 from paste.deploy import loadapp
 from pkg_resources import working_set
 
-# Set correct app name and conf 
-APP_NAME = 'mpulsweb'
-APP_CONF = 'production.ini'
-APP_PATH = '/usr/local/wsgi/scripts/'+APP_NAME
+TYPE=mpuls
+
+# Set correct app name and conf
+APP_NAME = '${TYPE}web'
+APP_PATH = '/home/mpuls/${TYPE}'
 SUB_PATH = APP_PATH+'/'+APP_NAME
+LIBMPULS_PATH = '/home/mpuls/${TYPE}/libmpuls'
+LIBFORMED_PATH = '/home/mpuls/${TYPE}/libformed'
+MPULSWEB_PATH = '/home/mpuls/${TYPE}/mpulsweb'
 
-if not APP_PATH in sys.path: sys.path.append(APP_PATH)
 if not SUB_PATH in sys.path: sys.path.append(SUB_PATH)
+if not LIBMPULS_PATH in sys.path: sys.path.append(LIBMPULS_PATH)
+if not LIBFORMED_PATH in sys.path: sys.path.append(LIBFORMED_PATH)
+if not MPULSWEB_PATH in sys.path: sys.path.append(MPULSWEB_PATH)
 
-working_set.add_entry(APP_PATH)
+working_set.add_entry(MPULSWEB_PATH)
+working_set.add_entry(SUB_PATH)
 
-os.environ['PYTHON_EGG_CACHE'] = '/usr/local/wsgi/egg_cache'
-
-locale.setlocale(locale.LC_ALL, "de_DE.UTF-8")
-
-# Double check if path to config file is correct. 
-application = loadapp('config:%s/%s' % (APP_PATH, APP_CONF)
+# Double check if path to config file is correct.
+application = loadapp('config:/home/mpuls/${TYPE}/production.ini')