File icinga-workaround-131-apache-conf-issue.patch of Package icinga.549

Overview Repositories Revisions Requests Users Attributes Meta

File icinga-workaround-131-apache-conf-issue.patch of Package icinga.549

--- icinga-1.10.3.old/sample-config/httpd.conf.in	2014-02-11 12:05:36.000000000 +0100
+++ icinga-1.10.3/sample-config/httpd.conf.in	2014-02-18 17:19:04.804017535 +0100
@@ -5,62 +5,38 @@
 # configuration file.  Customize the paths, etc. as
 # needed to fit your system.
 
+<IfDefine ICINGA>
 ScriptAlias @cgiurl@ "@sbindir@"
 
 <Directory "@sbindir@">
 #  SSLRequireSSL
    Options ExecCGI
    AllowOverride None
-
+   Order allow,deny
+   Allow from all
+#  Order deny,allow
+#  Deny from all
+#  Allow from 127.0.0.1
    AuthName "Icinga Access"
    AuthType Basic
    AuthUserFile @HTTPAUTHFILE@
+   Require valid-user
+</Directory>
 
-   <IfModule mod_authz_core.c>
-      # Apache 2.4
-      <RequireAll>
-         Require all granted
-         # Require local
-         Require valid-user
-      </RequireAll>
-   </IfModule>
-   <IfModule !mod_authz_core.c>
-      # Apache 2.2
-      Order allow,deny
-      Allow from all
-      #  Order deny,allow
-      #  Deny from all
-      #  Allow from 127.0.0.1
-      Require valid-user
-    </IfModule>
- </Directory>
-
-Alias @htmurl@ "@datadir@/"
+Alias @htmurl@ "@datadir@"
 
-<Directory "@datadir@/">
+<Directory "@datadir@">
 #  SSLRequireSSL
    Options None
    AllowOverride All
-
+   Order allow,deny
+   Allow from all
+#  Order deny,allow
+#  Deny from all
+#  Allow from 127.0.0.1
    AuthName "Icinga Access"
    AuthType Basic
    AuthUserFile @HTTPAUTHFILE@
-
-   <IfModule mod_authz_core.c>
-      # Apache 2.4
-      <RequireAll>
-         Require all granted
-         # Require local
-         Require valid-user
-      </RequireAll>
-   </IfModule>
-   <IfModule !mod_authz_core.c>
-      # Apache 2.2
-      Order allow,deny
-      Allow from all
-      #  Order deny,allow
-      #  Deny from all
-      #  Allow from 127.0.0.1
-      Require valid-user
-   </IfModule>
+   Require valid-user
 </Directory>
+</IfDefine>

Places

File icinga-workaround-131-apache-conf-issue.patch of Package icinga.549

Places