- Added php5 apache module test debian bug #523461 & GOsa bug #650

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@13691 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/Changelog b/Changelog
index 365b6c9eee04313a34fbbc6e5c1ce2249fb540c5..f529fc0c5c3ada5cf4cc7029bce261f9a95ad6d8 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -9,6 +9,7 @@ GOsa2 changelog
   * Added finish debconf template (closes:#501937)
   * Added russian debconf template (closes:#502888)
   * Missing attributes in group ACL menu (closes:528179)
+  * Added test in apache for php5 apache module presence (closes:523461)
   * Cleaned debian packaging
   * Updated German Translation.
   * Applied patch to allow selecting the primary Group when copying users

diff --git a/debian/apache.conf b/debian/apache.conf
index 6744f3cc9a7d698895897d11505c14d8ac0e980a..032c718754675a43152c92b7d72833e01507e113 100644 (file)
--- a/debian/apache.conf
+++ b/debian/apache.conf
@@ -3,14 +3,25 @@
 # Set alias to gosa
 Alias /gosa /usr/share/gosa/html
 
-<Location /gosa>
-  php_admin_flag engine on
-  php_admin_flag register_globals off
-  php_admin_flag allow_call_time_pass_reference on
-  php_admin_flag expose_php off
-  php_admin_flag zend.ze1_compatibility_mode off
-  php_admin_flag register_long_arrays off
-  php_admin_flag magic_quotes_gpc on
-  #include /etc/gosa/gosa.secrets
-</Location>
+<IfModule mod_php5.c>
+   <Location /gosa>
+     php_admin_flag engine on
+     php_admin_flag register_globals off
+     php_admin_flag allow_call_time_pass_reference off
+     php_admin_flag expose_php off
+     php_admin_flag zend.ze1_compatibility_mode off
+     php_admin_flag register_long_arrays off
+     php_admin_flag magic_quotes_gpc on
+#     include /etc/gosa/gosa.secrets
+   </Location>
+</IfModule>
 
+#<IfModule mod_fcgid.c>
+#   PHP_Fix_Pathinfo_Enable 1
+#   <Location /gosa>
+#     Options +ExecCGI
+#     AddHandler fcgid-script .php
+#     FCGIWrapper /var/www/php-fcgi/php-fcgi-starter .php
+#     include /etc/gosa/gosa.secrets
+#   </Location>
+#</IfModule>

diff --git a/debian/changelog b/debian/changelog
index a8879047f5da14b4c2ca822e81fcdca06d44c787..8a21354d9c6f1325fbf70b18f3d2aaf77e521b63 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,11 +7,12 @@ gosa (2.5.19-1) unstable; urgency=low
   * Added finish debconf template (closes:#501937)
   * Added russian debconf template (closes:#502888)
   * Missing attributes in group ACL menu (closes:528179)
+  * Added test in apache for php5 apache module presence (closes:523461)
   * Cleaned debian packaging
   * Updated German Translation.
   * Applied patch to allow selecting the primary Group when copying users
   * Added a section how to report a bug
-  * Added Benoit Mortier as maintener
+  * Added Benoit Mortier as uploader
 
  -- Benoit Mortier <benoit.mortier@opensides.be>  Fri, 29 May 2009 18:23:00 +0100