Revert "Merge branch 'release_3.0.0' into devel"

This reverts commit 3cedfe6c679e5b289bd0a27defb6198d063ba8e8.
This commit is contained in:
Matthew Jones
2016-07-07 12:40:10 -04:00
parent 22437f80ed
commit 6b73fb2c27
321 changed files with 8400 additions and 8261 deletions

View File

@@ -47,4 +47,5 @@ WSGIPythonHome /var/lib/awx/venv/tower
</IfVersion>
</Directory>
Include conf.d/awx-munin.conf
</VirtualHost>

12
config/awx-munin-el.conf Normal file
View File

@@ -0,0 +1,12 @@
Alias /munin /var/www/html/munin/
<Directory /var/www/html/munin/>
Order Allow,Deny
Allow from all
AuthUserFile /var/lib/awx/.munin_htpasswd
AuthName "Munin"
AuthType Basic
require valid-user
</Directory>
ScriptAlias /munin-cgi/munin-cgi-graph /var/www/cgi-bin/munin-cgi-graph

View File

@@ -0,0 +1,17 @@
Alias /munin /var/cache/munin/www
<Directory /var/cache/munin/www>
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>

11
config/awx-munin.conf Normal file
View File

@@ -0,0 +1,11 @@
Alias /munin /var/www/html/munin/
<Directory /var/www/html/munin/>
Order Allow,Deny
Allow from all
AuthUserFile /var/lib/awx/.munin_htpasswd
AuthName "Munin"
AuthType Basic
require valid-user
</Directory>

View File

@@ -0,0 +1,3 @@
[tower_jobs]
user awx