From 2b1b8676aa688a317b29b2a5ee4c9d0da89b71e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@fusiondirectory.org>
Date: Tue, 25 Aug 2020 11:58:51 +0200
Subject: [PATCH] :ambulance: fix(fusiondirectory-setup) Fix smarty path
setting for --write-vars
issue #6097
---
contrib/bin/fusiondirectory-setup | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/contrib/bin/fusiondirectory-setup b/contrib/bin/fusiondirectory-setup
index 6897e5c8c..23d8a17ea 100644
--- a/contrib/bin/fusiondirectory-setup
+++ b/contrib/bin/fusiondirectory-setup
@@ -64,7 +64,7 @@ my %vars = (
fd_home => "/var/www/fusiondirectory",
fd_cache => "/var/cache/fusiondirectory",
fd_config_dir => "/etc/fusiondirectory",
- fd_smarty_dir => "/usr/share/php/smarty3",
+ fd_smarty_path => "/usr/share/php/smarty3/Smarty.class.php",
fd_spool_dir => "/var/spool/fusiondirectory",
ldap_conf => "/etc/ldap/ldap.conf",
config_file => "fusiondirectory.conf",
@@ -558,7 +558,7 @@ if (!defined("CONFIG_FILE")) {
}
/* Path for smarty3 libraries */
-define("SMARTY", "$vars{fd_smarty_dir}");
+define("SMARTY", "$vars{fd_smarty_path}");
/* Smarty compile dir */
define ("SPOOL_DIR", "$vars{fd_spool_dir}/"); /* FusionDirectory spool directory */
@@ -2233,16 +2233,16 @@ This flag will answer "yes" to every yes/no question asked by the script
locale_cache_dir [locale]
config_file [fusiondirectory.conf]
fd_cache [/var/cache/fusiondirectory]
-fd_smarty_dir [/usr/share/php/smarty3]
+fd_smarty_path [/usr/share/php/smarty3/Smarty.class.php]
fd_spool_dir [/var/spool/fusiondirectory]
fai_log_dir [fai]
-tmp_dir [tmp]
+tmp_dir [tmp]
secrets_file [fusiondirectory.secrets]
template_dir [template]
locale_dir [locale]
class_cache [class.cache]
fd_config_dir [/etc/fusiondirectory]
-fd_home [/var/www/fusiondirectory]
+fd_home [/var/www/fusiondirectory]
benoit@catbert$ fusiondirectory-setup --set-class_cache=class.cache --write-vars
--
GitLab