From 4450a3b9d83bf670684cd25b741877bafc642ea4 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sun, 29 Sep 2013 15:37:21 +0200
Subject: glpi: sync with rawhide

---
 glpi-httpd.conf | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

(limited to 'glpi-httpd.conf')

diff --git a/glpi-httpd.conf b/glpi-httpd.conf
index dc48482..e17d296 100644
--- a/glpi-httpd.conf
+++ b/glpi-httpd.conf
@@ -7,16 +7,35 @@ Alias /glpi /usr/share/glpi
     php_value memory_limit 64M
 
     <IfModule mod_authz_core.c>
-       Require all granted
+        Require all granted
     </IfModule>
     <IfModule !mod_authz_core.c>
-       Order deny,allow
-       Allow from all
+        Order deny,allow
+        Allow from all
     </IfModule>
 </Directory>
 
 <Directory /usr/share/glpi/install>
 
+    # Install is only allowed via local access (from the GLPI server).
+    # Add your IP address if you need it for remote installation,
+    # but remember to remove it after installation for security.
+
+    <IfModule mod_authz_core.c>
+        # Apache 2.4
+        Require local
+        # Require ip ##.##.##.##
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
+        Order Deny,Allow
+        Deny from All
+        Allow from 127.0.0.1
+        Allow from ::1
+    </IfModule>
+
+    ErrorDocument 403 "<p><b>Restricted area.</b><br />Only local access allowed.<br />Check your configuration or contact your administrator.</p>"
+
     # migration could be very long
     php_value max_execution_time 0
     php_value memory_limit -1
-- 
cgit