diff options
| author | Bill Nottingham <notting@ansible.com> | 2016-06-06 22:46:19 +0200 |
|---|---|---|
| committer | Bill Nottingham <notting@ansible.com> | 2016-06-06 22:46:19 +0200 |
| commit | 74561e218ce748e05aeff6646d9959d269ce5a22 (patch) | |
| tree | ddc18b416e550dc0f6169e3092625cdacb273d81 /config | |
| parent | Merge pull request #2163 from anoek/2162 (diff) | |
| download | awx-74561e218ce748e05aeff6646d9959d269ce5a22.tar.xz awx-74561e218ce748e05aeff6646d9959d269ce5a22.zip | |
munin is dead. Long live munin!
Wait, not that.
Diffstat (limited to 'config')
| -rw-r--r-- | config/awx-httpd-443.conf | 1 | ||||
| -rw-r--r-- | config/awx-munin-el.conf | 12 | ||||
| -rw-r--r-- | config/awx-munin-ubuntu.conf | 17 | ||||
| -rw-r--r-- | config/awx-munin.conf | 11 | ||||
| -rw-r--r-- | config/awx_munin_tower_jobs | 3 |
5 files changed, 0 insertions, 44 deletions
diff --git a/config/awx-httpd-443.conf b/config/awx-httpd-443.conf index 95157748b2..2266f042c6 100644 --- a/config/awx-httpd-443.conf +++ b/config/awx-httpd-443.conf @@ -47,5 +47,4 @@ WSGIPythonHome /var/lib/awx/venv/tower </IfVersion> </Directory> - Include conf.d/awx-munin.conf </VirtualHost> diff --git a/config/awx-munin-el.conf b/config/awx-munin-el.conf deleted file mode 100644 index 833a6f36bf..0000000000 --- a/config/awx-munin-el.conf +++ /dev/null @@ -1,12 +0,0 @@ -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
\ No newline at end of file diff --git a/config/awx-munin-ubuntu.conf b/config/awx-munin-ubuntu.conf deleted file mode 100644 index 90c479f77a..0000000000 --- a/config/awx-munin-ubuntu.conf +++ /dev/null @@ -1,17 +0,0 @@ - -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> diff --git a/config/awx-munin.conf b/config/awx-munin.conf deleted file mode 100644 index ca4f4c39ad..0000000000 --- a/config/awx-munin.conf +++ /dev/null @@ -1,11 +0,0 @@ -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> diff --git a/config/awx_munin_tower_jobs b/config/awx_munin_tower_jobs deleted file mode 100644 index ff2cc225f8..0000000000 --- a/config/awx_munin_tower_jobs +++ /dev/null @@ -1,3 +0,0 @@ -[tower_jobs] -user awx - |