SOURCES: munin-apache.conf, munin-lighttpd.conf - htaccess added

[baggins]

Author: baggins                      Date: Wed Dec  3 22:35:30 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- htaccess added

---- Files affected:
SOURCES:
   munin-apache.conf (1.2 -> 1.3) , munin-lighttpd.conf (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/munin-apache.conf
diff -u SOURCES/munin-apache.conf:1.2 SOURCES/munin-apache.conf:1.3
--- SOURCES/munin-apache.conf:1.2	Wed Dec  3 23:10:37 2008
+++ SOURCES/munin-apache.conf	Wed Dec  3 23:35:24 2008
@@ -4,6 +4,21 @@
 	AllowOverride None
 	Order allow,deny
 	Allow from all
+
+	# Make Munin password protected
+#	AuthUserFile /etc/webapps/munin/htpasswd
+#	AuthName "Munin"
+#	AuthType Basic
+#	require valid-user
+
+	<IfModule mod_expires>
+		# Set the default expiery time for files 5 minutes 10 seconds
+		# from their creation (modification) time.
+		# There are probably new files by that time.
+
+		ExpiresActive On
+		ExpiresDefault M310
+	</IfModule>
 </Directory>
 
 #

================================================================
Index: SOURCES/munin-lighttpd.conf
diff -u SOURCES/munin-lighttpd.conf:1.1 SOURCES/munin-lighttpd.conf:1.2
--- SOURCES/munin-lighttpd.conf:1.1	Wed Dec  3 23:15:33 2008
+++ SOURCES/munin-lighttpd.conf	Wed Dec  3 23:35:25 2008
@@ -2,3 +2,19 @@
 	"/munin/" => "/var/lib/munin/html/",
 	"/munin/dyn" => "/usr/share/munin/cgi/",
 )
+
+#$HTTP["url"] =~ "^/munin/" {
+#	# Make Munin password protected
+#	auth.backend = "htpasswd"
+#	auth.backend.htpasswd.userfile = "/etc/webapps/munin/htpasswd"
+#
+#	auth.require += (
+#		"/" => (
+#			"method"  => "basic",
+#			"realm"   => "Munin",
+#			"require" => "valid-user"
+#		)
+#	)
+#)
+
+# vim:ts=4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/munin-apache.conf?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/munin-lighttpd.conf?r1=1.1&r2=1.2&f=u