diff options
| author | Leigh Johnson <ljohnson@ansible.com> | 2016-03-11 21:33:16 +0100 |
|---|---|---|
| committer | Leigh Johnson <ljohnson@ansible.com> | 2016-03-11 21:33:16 +0100 |
| commit | ff1c41e8dcbe243c92e9014b591fbe155c5c3e7f (patch) | |
| tree | ff47a9630ef669d39a0a05beb5256d0c9a54d47c /config | |
| parent | refactor delete-job-template.service-test, integrate jobTemplate.copy, resolv... (diff) | |
| download | awx-ff1c41e8dcbe243c92e9014b591fbe155c5c3e7f.tar.xz awx-ff1c41e8dcbe243c92e9014b591fbe155c5c3e7f.zip | |
revert unintended change to awx-munin.conf
Diffstat (limited to 'config')
| -rw-r--r-- | config/awx-munin.conf | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/config/awx-munin.conf b/config/awx-munin.conf index 833a6f36bf..5cfffe573e 100644 --- a/config/awx-munin.conf +++ b/config/awx-munin.conf @@ -1,12 +1,17 @@ -Alias /munin /var/www/html/munin/ -<Directory /var/www/html/munin/> + +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 -</Directory> -ScriptAlias /munin-cgi/munin-cgi-graph /var/www/cgi-bin/munin-cgi-graph
\ No newline at end of file + <IfModule mod_expires.c> + ExpiresActive On + ExpiresDefault M310 + </IfModule> +</Directory>
\ No newline at end of file |