Adding munin install and configuration to the playbook and package builds

3 files changed, 39 insertions, 0 deletions

diff --git a/config/awx-httpd-443.conf b/config/awx-httpd-443.conf
index e74e19f199..29f1af4d0a 100644
--- a/config/awx-httpd-443.conf
+++ b/config/awx-httpd-443.conf
@@ -41,4 +41,5 @@ WSGISocketPrefix /var/run/wsgi
     </IfVersion>
   </Directory>
 
+  Include conf.d/awx-munin.conf
 </VirtualHost>
diff --git a/config/awx-munin-el.conf b/config/awx-munin-el.conf
new file mode 100644
index 0000000000..41f6183bb6
--- /dev/null
+++ b/config/awx-munin-el.conf
@@ -0,0 +1,5 @@
+Alias /munin /var/www/html/munin/
+<Directory /var/www/html/munin/>
+        Order Allow,Deny
+        Allow from all
+</Directory>
diff --git a/config/awx-munin-ubuntu.conf b/config/awx-munin-ubuntu.conf
new file mode 100644
index 0000000000..936eb706ca
--- /dev/null
+++ b/config/awx-munin-ubuntu.conf
@@ -0,0 +1,33 @@
+
+Alias /munin /var/cache/munin/www
+<Directory /var/cache/munin/www>
+        Order allow,deny
+        Allow from all
+        Options FollowSymLinks
+
+        # This file can be used as a .htaccess file, or a part of your apache
+        # config file.
+        #
+        # For the .htaccess file option to work the munin www directory
+        # (/var/cache/munin/www) must have "AllowOverride all" or something
+        # close to that set.
+        #
+
+        # AuthUserFile /etc/munin/munin-htpasswd
+        # AuthName "Munin"
+        # AuthType Basic
+        # require valid-user
+
+        # This next part requires mod_expires to be enabled.
+        #
+
+        # Set the default expiration time for files to 5 minutes 10 seconds from
+        # their creation (modification) time.  There are probably new files by
+        # that time.
+        #
+
+    <IfModule mod_expires.c>
+        ExpiresActive On
+        ExpiresDefault M310
+    </IfModule>
+</Directory>