diff options
| author | Michael DeHaan <michael@ansibleworks.com> | 2013-09-07 20:54:14 +0200 |
|---|---|---|
| committer | Michael DeHaan <michael@ansibleworks.com> | 2013-09-07 20:54:14 +0200 |
| commit | 82f385237aebc4ce1ba7e4ea5428d5ef40de3020 (patch) | |
| tree | 5e65cb4aae3e8b8a2bb82249b893fd32fdd22eb9 /config | |
| parent | Remove references to tarball installation method (non-operational given confi... (diff) | |
| download | awx-82f385237aebc4ce1ba7e4ea5428d5ef40de3020.tar.xz awx-82f385237aebc4ce1ba7e4ea5428d5ef40de3020.zip | |
Make UI always use https:// but API traffic that wants to can still get http://
Diffstat (limited to 'config')
| -rw-r--r-- | config/awx-plain.conf | 19 | ||||
| -rw-r--r-- | config/awx.conf | 1 |
2 files changed, 16 insertions, 4 deletions
diff --git a/config/awx-plain.conf b/config/awx-plain.conf index a5b4200022..1bb1dafbd9 100644 --- a/config/awx-plain.conf +++ b/config/awx-plain.conf @@ -1,12 +1,24 @@ +WSGISocketPrefix /var/run/wsgi + <VirtualHost _default_:80> + + RewriteEngine On + # don't redirect HTTPs + RewriteCond %{HTTPS} off + # don't redirect /api traffic that requested explicit http:// + RewriteRule ^/api - [L] + RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} + ServerName localhost ServerAlias localhost ServerAlias 127.0.0.1 DocumentRoot /var/lib/awx/public - RewriteEngine On - RewriteCond %{HTTPS} off - RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} + WSGIScriptAlias / /var/lib/awx/wsgi.py + WSGIPassAuthorization On + + WSGIDaemonProcess awx_plain user=awx group=awx processes=2 threads=20 maximum-requests=1000 display-name="%{GROUP}" + WSGIProcessGroup awx_plain Alias /favicon.ico /var/lib/awx/public/static/favicon.ico Alias /static/ /var/lib/awx/public/static/ @@ -23,4 +35,5 @@ Allow from all </Directory> + </VirtualHost> diff --git a/config/awx.conf b/config/awx.conf index 63dba5295c..b9ae3c69e1 100644 --- a/config/awx.conf +++ b/config/awx.conf @@ -14,7 +14,6 @@ LoadModule ssl_module modules/mod_ssl.so WSGIScriptAlias / /var/lib/awx/wsgi.py WSGIPassAuthorization On - # FIXME: May want to tune these parameters after performance testing. WSGIDaemonProcess awx user=awx group=awx processes=2 threads=20 maximum-requests=1000 display-name="%{GROUP}" WSGIProcessGroup awx |