diff options
| author | Graham Mainwaring <gmainwaring@ansible.com> | 2016-03-23 20:46:00 +0100 |
|---|---|---|
| committer | Graham Mainwaring <gmainwaring@ansible.com> | 2016-03-23 20:46:00 +0100 |
| commit | ba916ed25f82587ff2d65966025139d9cc4f0334 (patch) | |
| tree | 7a8c9b924a409a8e3828340034dfe5c6ad8cd772 /config | |
| parent | Merge branch 'python27_el6' of github.com:ghjm/ansible-tower into python27_el6 (diff) | |
| download | awx-ba916ed25f82587ff2d65966025139d9cc4f0334.tar.xz awx-ba916ed25f82587ff2d65966025139d9cc4f0334.zip | |
Preliminary EL6 SCL Python 2.7 support
Diffstat (limited to 'config')
| -rw-r--r-- | config/awx-httpd-443.conf | 2 | ||||
| -rw-r--r-- | config/awx-httpd-80.conf | 1 | ||||
| -rw-r--r-- | config/awx-munin.conf | 13 |
3 files changed, 7 insertions, 9 deletions
diff --git a/config/awx-httpd-443.conf b/config/awx-httpd-443.conf index 9f41b2f17b..95157748b2 100644 --- a/config/awx-httpd-443.conf +++ b/config/awx-httpd-443.conf @@ -1,5 +1,7 @@ NameVirtualHost *:443 WSGISocketPrefix /var/run/wsgi +WSGIPythonHome /var/lib/awx/venv/tower + # LoadModule ssl_module modules/mod_ssl.so <VirtualHost _default_:443> diff --git a/config/awx-httpd-80.conf b/config/awx-httpd-80.conf index bc4a9b2e8e..f1390fead3 100644 --- a/config/awx-httpd-80.conf +++ b/config/awx-httpd-80.conf @@ -1,4 +1,5 @@ WSGISocketPrefix /var/run/wsgi +WSGIPythonHome /var/lib/awx/venv/tower <VirtualHost _default_:80> diff --git a/config/awx-munin.conf b/config/awx-munin.conf index 5cfffe573e..833a6f36bf 100644 --- a/config/awx-munin.conf +++ b/config/awx-munin.conf @@ -1,17 +1,12 @@ - -Alias /munin /var/cache/munin/www -<Directory /var/cache/munin/www> +Alias /munin /var/www/html/munin/ +<Directory /var/www/html/munin/> Order Allow,Deny Allow from all - Options FollowSymLinks AuthUserFile /var/lib/awx/.munin_htpasswd AuthName "Munin" AuthType Basic require valid-user - <IfModule mod_expires.c> - ExpiresActive On - ExpiresDefault M310 - </IfModule> -</Directory>
\ No newline at end of file +</Directory> +ScriptAlias /munin-cgi/munin-cgi-graph /var/www/cgi-bin/munin-cgi-graph
\ No newline at end of file |