From 7f13b03c93343949abc17c0ffb0c79405e164840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Wed, 23 Jan 2019 16:48:22 +0100
Subject: [PATCH] :sparkles: feat(#5950) Fix fusiondirectory-setup
--encrypt-password output
To match new recomendation on Apache setup, and to use vars instead of
hard coded paths.
---
contrib/bin/fusiondirectory-setup | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/contrib/bin/fusiondirectory-setup b/contrib/bin/fusiondirectory-setup
index d8ba7c1bc..d774746c2 100644
--- a/contrib/bin/fusiondirectory-setup
+++ b/contrib/bin/fusiondirectory-setup
@@ -278,24 +278,18 @@ sub encrypt_passwords {
# Print reminder
print "
-Please adapt your http fusiondirectory location declaration to include the newly
+Please adapt your http fusiondirectory declaration to include the newly
created $fd_secrets.
Example:
-Alias /fusiondirectory /usr/share/fusiondirectory/html
-
-<Location /fusiondirectory>
- 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_value upload_tmp_dir /var/spool/fusiondirectory/
- php_admin_value session.cookie_lifetime 0
- include /etc/fusiondirectory/fusiondirectory.secrets
-</Location>
+# Include FusionDirectory to your web service
+Alias /fusiondirectory $vars{fd_home}
+
+<Directory $vars{fd_home}>
+ # Include the secrects file
+ include $fd_secrets
+</Directory>
Please reload your httpd configuration after you've modified anything.\n";
--
GitLab