From ff1c41e8dcbe243c92e9014b591fbe155c5c3e7f Mon Sep 17 00:00:00 2001
From: Leigh Johnson <ljohnson@ansible.com>
Date: Fri, 11 Mar 2016 15:33:16 -0500
Subject: revert unintended change to awx-munin.conf

---
 config/awx-munin.conf | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'config')

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
-- 
cgit v1.2.3