diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 4ccc818bde..020d8fc9c4 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -264,7 +264,7 @@ website: apps.fedoraproject.org destname: autocloud localpath: /autocloud - remotepath: / + remotepath: /autocloud proxyurl: http://localhost:10041 - role: httpd/reverseproxy diff --git a/roles/autocloud/frontend/templates/autocloud.conf b/roles/autocloud/frontend/templates/autocloud.conf index 01d1353e5f..75b603c027 100644 --- a/roles/autocloud/frontend/templates/autocloud.conf +++ b/roles/autocloud/frontend/templates/autocloud.conf @@ -1,6 +1,6 @@ LoadModule wsgi_module modules/mod_wsgi.so -Alias /autocloud/static /usr/lib/python2.7/site-packages/autocloud/web/static/ +Alias /autocloud/static /usr/share/autocloud/static WSGIPythonEggs /var/cache/autocloud/.python-eggs WSGIDaemonProcess autocloud user=apache group=apache maximum-requests=50000 display-name=autocloud processes=3 threads=4 inactivity-timeout=300 @@ -9,7 +9,12 @@ WSGIRestrictStdout Off WSGIRestrictSignal Off WSGIPythonOptimize 1 -WSGIScriptAlias / /usr/share/autocloud/autocloud.wsgi +WSGIScriptAlias /autocloud /usr/share/autocloud/autocloud.wsgi + + + WSGIProcessGroup autocloud + Require all granted + Order deny,allow diff --git a/roles/haproxy/templates/haproxy.cfg.stg b/roles/haproxy/templates/haproxy.cfg.stg index d457f7fd8c..f9f85856dd 100644 --- a/roles/haproxy/templates/haproxy.cfg.stg +++ b/roles/haproxy/templates/haproxy.cfg.stg @@ -183,7 +183,7 @@ listen autocloud 0.0.0.0:10041 balance hdr(appserver) server autocloud-web01 autocloud-web01:80 check inter 10s rise 1 fall 2 server autocloud-web02 autocloud-web02:80 check inter 10s rise 1 fall 2 - option httpchk GET / + option httpchk GET /autocloud/ # Apache doesn't handle the initial connection here like the other proxy # entries. This proxy also doesn't use the http mode like the others.