Adding apache config for munin

diff --git a/files/munin/apache.conf b/files/munin/apache.conf
new file mode 100644 (file)
index 0000000..553a624
--- /dev/null
+++ b/files/munin/apache.conf
@@ -0,0 +1,86 @@
+# Enable this for template generation
+Alias /munin /var/cache/munin/www
+
+# Enable this for cgi-based templates
+#Alias /munin-cgi/static /var/cache/munin/www/static
+#ScriptAlias /munin-cgi /usr/lib/munin/cgi/munin-cgi-html
+#<Location /munin-cgi>
+#      Order allow,deny
+#      Allow from localhost 127.0.0.0/8 ::1
+#      AuthUserFile /etc/munin/munin-htpasswd
+#      AuthName "Munin"
+#      AuthType Basic
+#      require valid-user
+#</Location>
+
+<Directory /var/cache/munin/www>
+        Order allow,deny
+        Allow from localhost 127.0.0.0/8 ::1
+        Options None
+
+       # 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> 
+
+# Enables fastcgi for munin-cgi-html if present
+#<Location /munin-cgi>
+#    <IfModule mod_fastcgi.c>
+#        SetHandler fastcgi-script
+#    </IfModule>
+#</Location>
+
+#<Location /munin-cgi/static>
+#      SetHandler None
+#</Location>
+
+# Enables fastcgi for munin-cgi-graph if present
+ScriptAlias /munin-cgi/munin-cgi-graph /usr/lib/munin/cgi/munin-cgi-graph
+<Location /munin-cgi/munin-cgi-graph>
+       Order allow,deny
+       Allow from localhost 127.0.0.0/8 ::1
+       # AuthUserFile /etc/munin/munin-htpasswd
+       # AuthName "Munin"
+       # AuthType Basic
+       # require valid-user
+        <IfModule mod_fastcgi.c>
+                SetHandler fastcgi-script
+        </IfModule>
+</Location>
+
+ScriptAlias /munin-cgi/munin-cgi-html /usr/lib/munin/cgi/munin-cgi-html
+<Location /munin-cgi/munin-cgi-html>
+       Order allow,deny
+       Allow from localhost 127.0.0.0/8 ::1
+       # AuthUserFile /etc/munin/munin-htpasswd
+       # AuthName "Munin"
+       # AuthType Basic
+       # require valid-user
+        <IfModule mod_fastcgi.c>
+                SetHandler fastcgi-script
+        </IfModule>
+</Location>
+

diff --git a/manifests/subsystem/monitor/master.pp b/manifests/subsystem/monitor/master.pp
index e23f02dadd56a47a9c971311f7e3711bd2f4402a..1f97a36f543ab1d1bb2293e9c1653695d2a67e69 100644 (file)
--- a/manifests/subsystem/monitor/master.pp
+++ b/manifests/subsystem/monitor/master.pp
@@ -13,6 +13,17 @@ class nodo::subsystem::monitor::master {
     default => 'absent',
   }
 
+  # Munin configuration for apache
+  file { '/etc/apache2/conf.d/munin':
+    ensure  => present,
+    owner   => root,
+    group   => root,
+    mode    => 0644,
+    source  => 'puppet:///modules/nodo/munin/apache.conf',
+    require => Package["apache"],
+    notify  => Service["apache"],
+  }
+
   # See http://www.jethrocarr.com/2012/05/26/munin-performance/
   file { "munin_graph_performance":
     ensure  => $ensure,