From c383745aeff22bdb9be5af86e64682997b0248d3 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 7 Nov 2014 14:44:35 +0100
Subject: glpi: - use httpd_var_lib_t selinux context for /var/lib/glpi - don't
 rely on system selinux policy in EPEL-7 - fix apache configuration when
 mod_php not enabled

---
 glpi-httpd.conf | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'glpi-httpd.conf')

diff --git a/glpi-httpd.conf b/glpi-httpd.conf
index e17d296..6d5b5b9 100644
--- a/glpi-httpd.conf
+++ b/glpi-httpd.conf
@@ -4,8 +4,6 @@ Alias /glpi /usr/share/glpi
     Options None
     AllowOverride Limit Options FileInfo
 
-    php_value memory_limit 64M
-
     <IfModule mod_authz_core.c>
         Require all granted
     </IfModule>
@@ -36,10 +34,11 @@ Alias /glpi /usr/share/glpi
 
     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
-
+    <IfModule mod_php5.c>
+        # migration could be very long
+        php_value max_execution_time 0
+        php_value memory_limit -1
+    </IfModule>
 </Directory>
 
 <Directory /usr/share/glpi/config>
@@ -67,4 +66,3 @@ Alias /glpi /usr/share/glpi
 #  DocumentRoot /usr/share/glpi
 #  ServerName glpi.example.com
 #</VirtualHost>
-
-- 
cgit