diff options
author | varac <varacanero@zeromail.org> | 2016-03-01 11:59:10 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2016-03-01 11:59:10 +0100 |
commit | 53e2db13e5082f09fcee7d34ed83b3dfaef06e52 (patch) | |
tree | 3f082b3311d08140e29c9ca730cfa3c8061545a8 /files/configs/apache2.conf | |
parent | 70afab799b8cf720cd12bd225c1c2948fd1597ee (diff) | |
parent | c0dee4a2393e23b226e123a427898de94b342141 (diff) |
Merge remote-tracking branch 'shared/master' into leap_master
Diffstat (limited to 'files/configs/apache2.conf')
-rw-r--r-- | files/configs/apache2.conf | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/files/configs/apache2.conf b/files/configs/apache2.conf index 14bb38b..f0f8b2f 100644 --- a/files/configs/apache2.conf +++ b/files/configs/apache2.conf @@ -1,8 +1,8 @@ # apache configuration for nagios 3.x # note to users of nagios 1.x and 2.x: -# throughout this file are commented out sections which preserve -# backwards compatibility with bookmarks/config for older nagios versios. -# simply look for lines following "nagios 1.x:" and "nagios 2.x" comments. +# throughout this file are commented out sections which preserve +# backwards compatibility with bookmarks/config for older nagios versios. +# simply look for lines following "nagios 1.x:" and "nagios 2.x" comments. ScriptAlias /cgi-bin/nagios3 /usr/lib/cgi-bin/nagios3 ScriptAlias /nagios3/cgi-bin /usr/lib/cgi-bin/nagios3 @@ -28,22 +28,34 @@ Alias /nagios3 /usr/share/nagios3/htdocs #Alias /nagios /usr/share/nagios3/htdocs <DirectoryMatch (/usr/share/nagios3/htdocs|/usr/lib/cgi-bin/nagios3|/etc/nagios3/stylesheets)> - Options FollowSymLinks + Options FollowSymLinks - DirectoryIndex index.php index.html + DirectoryIndex index.php index.html - AllowOverride AuthConfig - Order Allow,Deny - Allow From All + AllowOverride AuthConfig - AuthName "Nagios Access" - AuthType Basic - AuthUserFile /etc/nagios3/htpasswd.users - # nagios 1.x: - #AuthUserFile /etc/nagios/htpasswd.users - require valid-user + + <IfVersion < 2.3> + Order Allow,Deny + Allow From All + </IfVersion> + + <IfVersion >= 2.3> + Require all denied + </IfVersion> + + AuthName "Nagios Access" + AuthType Basic + AuthUserFile /etc/nagios3/htpasswd.users + # nagios 1.x: + #AuthUserFile /etc/nagios/htpasswd.users + require valid-user </DirectoryMatch> +<Directory /usr/share/nagios3/htdocs> + Options +ExecCGI +</Directory> + # Enable this ScriptAlias if you want to enable the grouplist patch. # See http://apan.sourceforge.net/download.html for more info # It allows you to see a clickable list of all hostgroups in the |