From ef7956357e62f4aae314eacb99ed26bcfe01ec23 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 1 Jun 2015 20:29:38 +0200 Subject: jenkins.d.n jessie upgrade: rename to munin.conf --- etc/apache2/conf.d/munin | 102 ------------------------------------------ etc/apache2/conf.d/munin.conf | 102 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 102 deletions(-) delete mode 100644 etc/apache2/conf.d/munin create mode 100644 etc/apache2/conf.d/munin.conf (limited to 'etc/apache2') diff --git a/etc/apache2/conf.d/munin b/etc/apache2/conf.d/munin deleted file mode 100644 index feb4e9fd..00000000 --- a/etc/apache2/conf.d/munin +++ /dev/null @@ -1,102 +0,0 @@ -# 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 -# -# Order allow,deny -# Allow from localhost 127.0.0.0/8 ::1 -# AuthUserFile /etc/munin/munin-htpasswd -# AuthName "Munin" -# AuthType Basic -# require valid-user -# - - - Order allow,deny - Allow from all - 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. - # - - - ExpiresActive On - ExpiresDefault M310 - - - - -# Enables fastcgi for munin-cgi-html if present -# -# -# SetHandler fastcgi-script -# -# - -# -# SetHandler None -# - -# Enables fastcgi for munin-cgi-graph if present -ScriptAlias /munin-cgi/munin-cgi-graph /usr/lib/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 - - SetHandler fastcgi-script - - - -ScriptAlias /munin-cgi/munin-cgi-html /usr/lib/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 - - SetHandler fastcgi-script - - - -ExtendedStatus On - - # - # Allow server status reports generated by mod_status, - # with the URL of http://servername/server-status - # Change the ".example.com" to match your domain to enable. - # - - SetHandler server-status - Order deny,allow - Deny from all - Allow from 127.0.0.1 - Allow from 46.16.73.183 - - - diff --git a/etc/apache2/conf.d/munin.conf b/etc/apache2/conf.d/munin.conf new file mode 100644 index 00000000..feb4e9fd --- /dev/null +++ b/etc/apache2/conf.d/munin.conf @@ -0,0 +1,102 @@ +# 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 +# +# Order allow,deny +# Allow from localhost 127.0.0.0/8 ::1 +# AuthUserFile /etc/munin/munin-htpasswd +# AuthName "Munin" +# AuthType Basic +# require valid-user +# + + + Order allow,deny + Allow from all + 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. + # + + + ExpiresActive On + ExpiresDefault M310 + + + + +# Enables fastcgi for munin-cgi-html if present +# +# +# SetHandler fastcgi-script +# +# + +# +# SetHandler None +# + +# Enables fastcgi for munin-cgi-graph if present +ScriptAlias /munin-cgi/munin-cgi-graph /usr/lib/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 + + SetHandler fastcgi-script + + + +ScriptAlias /munin-cgi/munin-cgi-html /usr/lib/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 + + SetHandler fastcgi-script + + + +ExtendedStatus On + + # + # Allow server status reports generated by mod_status, + # with the URL of http://servername/server-status + # Change the ".example.com" to match your domain to enable. + # + + SetHandler server-status + Order deny,allow + Deny from all + Allow from 127.0.0.1 + Allow from 46.16.73.183 + + + -- cgit v1.2.3-70-g09d2