Fixed typos, updated apache config template

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

diff --git a/bin/gosa-encrypt-passwords b/bin/gosa-encrypt-passwords
index 0f8c5ada16888ed997033f71712d8c71ca30a136..505ce9f5a7486302c3d27248a20609f5870b8897 100755 (executable)
--- a/bin/gosa-encrypt-passwords
+++ b/bin/gosa-encrypt-passwords
@@ -94,11 +94,11 @@ Example:
 
 Alias /gosa /usr/share/gosa/html
 
-<Location /gosa-loc>
+<Location /gosa>
   php_admin_flag engine on
   php_admin_value open_basedir "/etc/gosa/:/usr/share/gosa/:/var/cache/gosa/:/var/spool/gosa/"
   php_admin_flag register_globals off
-  php_admin_flag allow_call_time_pass_reference 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

diff --git a/debian/apache.conf b/debian/apache.conf
index 353b04b3ad9f80fd302c280735cb8edb0a4238bd..caff220a2aa672a1e5e4f81234465923eb592782 100644 (file)
--- a/debian/apache.conf
+++ b/debian/apache.conf
@@ -2,3 +2,16 @@
 
 # Set alias to gosa
 Alias /gosa /usr/share/gosa/html
+
+<Location /gosa>
+  php_admin_flag engine on
+  php_admin_value open_basedir "/etc/gosa/:/usr/share/gosa/:/var/cache/gosa/:/var/spool/gosa/"
+  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>
+