23234803 sysrepo needs fixes for mod_wsgi upgrade s12b99
authorYiteng Zhang <yiteng.zhang@oracle.com>
Mon, 09 May 2016 18:19:15 -0700
changeset 3357 b59c93364f32
parent 3356 66ab3cc4794b
child 3358 0d43aeeb2dd6
23234803 sysrepo needs fixes for mod_wsgi upgrade
src/util/apache2/depot/depot_httpd.conf.mako
src/util/apache2/sysrepo/sysrepo_httpd.conf.mako
--- a/src/util/apache2/depot/depot_httpd.conf.mako	Mon May 09 18:03:25 2016 -0700
+++ b/src/util/apache2/depot/depot_httpd.conf.mako	Mon May 09 18:19:15 2016 -0700
@@ -104,9 +104,6 @@
 AddOutputFilterByType DEFLATE text/html application/javascript text/css text/plain
 # We only alias a specific script, not all files in ${template_dir}
 WSGIScriptAlias ${sroot}/depot ${template_dir}/depot_index.py
-# Run wsgi script in the current version of Python runtime
-WSGIPythonHome sys.executable
-WSGIPythonPath os.pathsep.join(sys.path)
 
 # We set a 5 minute inactivity timeout: if no requests have been received in the
 # last 5 minutes and no requests are currently being processed, mod_wsgi shuts
--- a/src/util/apache2/sysrepo/sysrepo_httpd.conf.mako	Mon May 09 18:03:25 2016 -0700
+++ b/src/util/apache2/sysrepo/sysrepo_httpd.conf.mako	Mon May 09 18:19:15 2016 -0700
@@ -78,9 +78,6 @@
 
 # We only alias a specific script, not all files in ${sysrepo_template_dir}
 WSGIScriptAlias /wsgi_p5p ${sysrepo_template_dir}/sysrepo_p5p.py
-# Run wsgi script in the current version of Python runtime
-WSGIPythonHome sys.executable
-WSGIPythonPath os.pathsep.join(sys.path)
 WSGIDaemonProcess sysrepo processes=1 threads=21 user=pkg5srv group=pkg5srv display-name=pkg5_sysrepo inactivity-timeout=120
 WSGIProcessGroup sysrepo
 WSGISocketPrefix ${sysrepo_runtime_dir}/wsgi