[icinga-checkins] icinga.org: icingaweb2/master: Packages: Add files/apache/ icingaweb.conf in favor of files/icingaweb-apache2.conf

git at icinga.org git at icinga.org
Wed Nov 19 13:36:39 CET 2014


Module: icingaweb2
Branch: master
Commit: 91233b0d6c59d91888e922d4deabf1571ccaca8c
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=91233b0d6c59d91888e922d4deabf1571ccaca8c

Author: Eric Lippmann <eric.lippmann at netways.de>
Date:   Wed Nov 19 13:36:02 2014 +0100

Packages: Add files/apache/icingaweb.conf in favor of files/icingaweb-apache2.conf

---

 packages/files/apache/icingaweb.conf  |   38 +++++++++++++++++++++++++++++++++
 packages/files/icingaweb-apache2.conf |   19 -----------------
 2 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/packages/files/apache/icingaweb.conf b/packages/files/apache/icingaweb.conf
new file mode 100644
index 0000000..e8c0c8f
--- /dev/null
+++ b/packages/files/apache/icingaweb.conf
@@ -0,0 +1,38 @@
+Alias /icingaweb "/usr/share/icingaweb/public"
+
+<Directory "/usr/share/icingaweb/public">
+    Options SymLinksIfOwnerMatch
+    AllowOverride None
+
+    <IfModule mod_authz_core.c>
+        # Apache 2.4
+        <RequireAll>
+            Require all granted
+        </RequireAll>
+    </IfModule>
+
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
+        Order allow,deny
+        Allow from all
+    </IfModule>
+
+    SetEnv ICINGAWEB_CONFIGDIR "/etc/icingaweb"
+
+    EnableSendfile Off
+
+    <IfModule mod_rewrite.c>
+        RewriteEngine on
+        RewriteBase /icingaweb/
+        RewriteCond %{REQUEST_FILENAME} -s [OR]
+        RewriteCond %{REQUEST_FILENAME} -l [OR]
+        RewriteCond %{REQUEST_FILENAME} -d
+        RewriteRule ^.*$ - [NC,L]
+        RewriteRule ^.*$ index.php [NC,L]
+    </IfModule>
+
+    <IfModule !mod_rewrite.c>
+        DirectoryIndex error_norewrite.html
+        ErrorDocument 404 /error_norewrite.html
+    </IfModule>
+</Directory>
diff --git a/packages/files/icingaweb-apache2.conf b/packages/files/icingaweb-apache2.conf
deleted file mode 100644
index cde9aee..0000000
--- a/packages/files/icingaweb-apache2.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-Alias /icingaweb "/usr/share/icingaweb/public"
-
-<Directory "/usr/share/icingaweb/public">
-  Options SymLinksIfOwnerMatch
-  AllowOverride None
-  Order allow,deny
-  Allow from all
-
-  # SetEnv ICINGAWEB_CONFIGDIR /etc/icingaweb
-
-  RewriteEngine on
-  RewriteBase /icingaweb/
-  RewriteCond %{REQUEST_FILENAME} -s [OR]
-  RewriteCond %{REQUEST_FILENAME} -l [OR]
-  RewriteCond %{REQUEST_FILENAME} -d
-  RewriteRule ^.*$ - [NC,L]
-  RewriteRule ^.*$ index.php [NC,L]
-</Directory>
-



More information about the icinga-checkins mailing list