From 32b509e5ab61d5d9fd60c9ade45f463c6ce67c2c Mon Sep 17 00:00:00 2001 From: Josef Skladanka Date: Feb 06 2014 12:30:32 +0000 Subject: fixed config files for packaging --- diff --git a/conf/resultsdb.conf b/conf/resultsdb.conf index 567bc6c..111588a 100644 --- a/conf/resultsdb.conf +++ b/conf/resultsdb.conf @@ -1,5 +1,5 @@ WSGIDaemonProcess resultsdb user=apache group=apache threads=5 -WSGIScriptAlias /resultsdb /var/www/resultsdb/conf/resultsdb.wsgi +WSGIScriptAlias /resultsdb /usr/share/resultsdb/resultsdb.wsgi WSGISocketPrefix run/wsgi # this isn't the best way to force SSL but it works for now @@ -7,7 +7,7 @@ WSGISocketPrefix run/wsgi #RewriteCond %{HTTPS} !=on #RewriteRule ^/resultsdb/admin/?(.*) https://%{SERVER_NAME}/$1 [R,L] - + WSGIProcessGroup resultsdb WSGIApplicationGroup %{GLOBAL} WSGIScriptReloading On @@ -15,9 +15,9 @@ WSGISocketPrefix run/wsgi Allow from all -Alias /resultsdb/static /var/www/resultsdb/resultsdb/static +#Alias /resultsdb/static /var/www/resultsdb/resultsdb/static - -Order allow,deny -Allow from all - +# +#Order allow,deny +#Allow from all +# diff --git a/conf/resultsdb.wsgi b/conf/resultsdb.wsgi index 704c60b..06375bd 100644 --- a/conf/resultsdb.wsgi +++ b/conf/resultsdb.wsgi @@ -1,7 +1,7 @@ # This is required for running on EL6 -#import __main__ -#__main__.__requires__ = ['SQLAlchemy >= 0.7', 'Flask >= 0.9', 'jinja2 >= 2.6'] -#import pkg_resources +import __main__ +__main__.__requires__ = ['SQLAlchemy >= 0.7', 'Flask >= 0.9', 'jinja2 >= 2.6'] +import pkg_resources # if you're running the app from a virtualenv, uncomment these lines #activate_this = '/var/www/resultsdb/env/bin/activate_this.py'