Update wsgi and httpd configuration

Author: henrikek

ESSArch_TA/config/httpd-eta.conf

@@ -26,8 +26,7 @@
 #
 Listen 4445
 <VirtualHost *:4445>
-    #ServerName ess50
-    ServerName essarch3_eta
+    ServerName essarch_ta
     # Logs
     ErrorLog /ESSArch/eta/log/httpd_error.log
     TransferLog /ESSArch/eta/log/httpd_access.log
@@ -37,28 +36,27 @@ Listen 4445
     # SSL
     SSLEngine on
     SSLCipherSuite HIGH:MEDIUM
-    SSLCertificateFile /ESSArch/eta/config/ssl/server.crt
-    SSLCertificateKeyFile /ESSArch/eta/config/ssl/server.key
-    SSLCertificateChainFile /ESSArch/eta/config/ssl/ca.crt
-    SSLCACertificateFile /ESSArch/eta/config/ssl/ca.crt
+    SSLCertificateFile /ESSArch/pd/python/lib/python2.7/site-packages/ESSArch_TA/config/ssl/server.crt
+    SSLCertificateKeyFile /ESSArch/pd/python/lib/python2.7/site-packages/ESSArch_TA/config/ssl/server.key
+    SSLCertificateChainFile /ESSArch/pd/python/lib/python2.7/site-packages/ESSArch_TA/config/ssl/ca.crt
+    SSLCACertificateFile /ESSArch/pd/python/lib/python2.7/site-packages/ESSArch_TA/config/ssl/ca.crt
 
     ###
-    Alias /static/ /ESSArch/eta/static/
+    Alias /static/ /ESSArch/pd/python/lib/python2.7/site-packages/ESSArch_TA/static/
 
-    <Directory /ESSArch/eta/static/>
+    <Directory /ESSArch/pd/python/lib/python2.7/site-packages/ESSArch_TA/static/>
         Order deny,allow
         Allow from all
     </Directory>
 
-    WSGIDaemonProcess essarch_eta processes=2 threads=10 display-name=%{GROUP} python-path=/ESSArch/eta:/ESSArch/bin
+    WSGIDaemonProcess essarch_eta processes=2 threads=10 display-name=%{GROUP} python-path=/ESSArch/pd/python/lib/python2.7/site-packages/ESSArch_TA:/ESSArch/config
     WSGIProcessGroup essarch_eta
-    WSGIScriptAlias / /ESSArch/eta/config/wsgi.py
+    WSGIScriptAlias / /ESSArch/pd/python/lib/python2.7/site-packages/ESSArch_TA/config/wsgi.py
 
-    <Directory /ESSArch/eta>
+    <Directory /ESSArch/pd/python/lib/python2.7/site-packages/ESSArch_TA>
         <Files wsgi.py>
           Order allow,deny
           Allow from all
         </Files>
     </Directory>
-</VirtualHost>
-
+</VirtualHost>

ESSArch_TA/config/wsgi.py

@@ -19,21 +19,8 @@
     Web - http://www.essolutions.se
     Email - essarch@essolutions.se
 '''
-
 """
-WSGI config for ESSArch Tools project.
-
-This module contains the WSGI application used by Django's development server
-and any production WSGI deployments. It should expose a module-level variable
-named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
-this application via the ``WSGI_APPLICATION`` setting.
-
-Usually you will have the standard Django WSGI application here, but it also
-might make sense to replace the whole Django WSGI application with a custom one
-that later delegates to the Django one. For example, you could introduce WSGI
-middleware here, or combine a Django application with an application of another
-framework.
-
+WSGI config for ESSArch TA.
 """
 import os, sys, platform
 
@@ -43,10 +30,11 @@
     execfile(activate_this, dict(__file__=activate_this))
     sys.path.append('/ESSArch/eta')
 else:
-    sys.path.append('/ESSArch/eta') # append path
+    sys.path.append('/ESSArch/pd/python/lib/python2.7/site-packages/ESSArch_TA')
+    sys.path.append('/ESSArch/config')
+    #sys.path.append('/ESSArch/eta') # append path
 
 os.environ["DJANGO_SETTINGS_MODULE"] = "config.settings"
 
 from django.core.wsgi import get_wsgi_application
 application = get_wsgi_application()
-

ESSArch_TA/install/install_default_config_eta.py

@@ -55,7 +55,7 @@ def installdefaultparameters(): # default config parameters
 
     # set default parameters according to site_profile SE
     if site_profile == "SE" :
-       dct = {
+        dct = {
              'site_profile':site_profile,
              'zone': zone ,
              'package_descriptionfile':'info.xml',

MANIFEST.in

@@ -1,3 +1,6 @@
-recursive-include * *.js *.html *.txt *.gif *.png *.css *.wsdl *.xml *.xsd *.sh *.types
+recursive-include * *.js *.html *.txt *.gif *.png *.css *.wsdl *.xml *.xsd *.sh
 include versioneer.py
-include ESSArch_TA/_version.py
+recursive-include ESSArch_TA/config *.conf *.crt *.key
+recursive-include ESSArch_TA/env *.xsd *.types
+recursive-include ESSArch_TA/static *
+recursive-include ESSArch_TA/testdata *