From 351f3e7884be3e088037ef166191c0cec54a57cc Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Mon, 26 Mar 2012 17:04:04 +0200
Subject: [PATCH] Fixes: #718 install-directories needs to be rewrote
---
contrib/bin/fusiondirectory-setup | 14 +++++++-------
include/variables.inc | 14 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/contrib/bin/fusiondirectory-setup b/contrib/bin/fusiondirectory-setup
index fccd8a9f6..8619687bc 100755
--- a/contrib/bin/fusiondirectory-setup
+++ b/contrib/bin/fusiondirectory-setup
@@ -331,7 +331,7 @@ sub install_directories {
* Generated by fusiondirectory-setup */
if(!defined("CONFIG_DIR")){
- define ("CONFIG_DIR", "$vars{fd_config_dir}"); /* FusionDirectory etc path */
+ define ("CONFIG_DIR", "$vars{fd_config_dir}/"); /* FusionDirectory etc path */
}
/* Allow setting the config file in the apache configuration
@@ -342,22 +342,22 @@ sub install_directories {
}
/* Smarty compile dir */
- define ("SPOOL_DIR","$vars{fd_spool_dir}"); /* FusionDirectory spool directory */
+ define ("SPOOL_DIR","$vars{fd_spool_dir}/"); /* FusionDirectory spool directory */
/* Global cache dir */
- define ("CACHE_DIR","$vars{fd_cache}"); /* FusionDirectory var directory */
+ define ("CACHE_DIR","$vars{fd_cache}/"); /* FusionDirectory var directory */
/* Global locale cache dir */
- define ("LOCALE_DIR", "$locale_cache_dir"); /* FusionDirectory locale directory */
+ define ("LOCALE_DIR", "$locale_cache_dir/"); /* FusionDirectory locale directory */
/* Global tmp dir */
- define ("TEMP_DIR", "$tmp_dir"); /* FusionDirectory tmp directory */
+ define ("TEMP_DIR", "$tmp_dir/"); /* FusionDirectory tmp directory */
/* Directory containing the configuration template */
- define ("CONFIG_TEMPLATE_DIR", "$template_dir"); /* FusionDirectory template directory */
+ define ("CONFIG_TEMPLATE_DIR", "$template_dir/"); /* FusionDirectory template directory */
/* Directory containing the fai logs */
- define ("FAI_LOG_DIR", "$fai_log_dir"); /* FusionDirectory fai directory */
+ define ("FAI_LOG_DIR", "$fai_log_dir/"); /* FusionDirectory fai directory */
/* Directory containing the vacation files */
define ("VACATION_DIR", "$vars{fd_cache}/vacation/"); /* FusionDirectory vacation directory */
diff --git a/include/variables.inc b/include/variables.inc
index a035c32b3..4e6139cb3 100644
--- a/include/variables.inc
+++ b/include/variables.inc
@@ -6,7 +6,7 @@
* Generated by fusiondirectory-setup */
if(!defined("CONFIG_DIR")){
- define ("CONFIG_DIR", "/etc/fusiondirectory"); /* FusionDirectory etc path */
+ define ("CONFIG_DIR", "/etc/fusiondirectory/"); /* FusionDirectory etc path */
}
/* Allow setting the config file in the apache configuration
@@ -17,22 +17,22 @@
}
/* Smarty compile dir */
- define ("SPOOL_DIR","/var/spool/fusiondirectory"); /* FusionDirectory spool directory */
+ define ("SPOOL_DIR","/var/spool/fusiondirectory/"); /* FusionDirectory spool directory */
/* Global cache dir */
- define ("CACHE_DIR","/var/cache/fusiondirectory"); /* FusionDirectory var directory */
+ define ("CACHE_DIR","/var/cache/fusiondirectory/"); /* FusionDirectory var directory */
/* Global locale cache dir */
- define ("LOCALE_DIR", "/var/cache/fusiondirectory/locale"); /* FusionDirectory locale directory */
+ define ("LOCALE_DIR", "/var/cache/fusiondirectory/locale/"); /* FusionDirectory locale directory */
/* Global tmp dir */
- define ("TEMP_DIR", "/var/cache/fusiondirectory/tmp"); /* FusionDirectory tmp directory */
+ define ("TEMP_DIR", "/var/cache/fusiondirectory/tmp/"); /* FusionDirectory tmp directory */
/* Directory containing the configuration template */
- define ("CONFIG_TEMPLATE_DIR", "/var/cache/fusiondirectory/template"); /* FusionDirectory template directory */
+ define ("CONFIG_TEMPLATE_DIR", "/var/cache/fusiondirectory/template/"); /* FusionDirectory template directory */
/* Directory containing the fai logs */
- define ("FAI_LOG_DIR", "/var/cache/fusiondirectory/fai"); /* FusionDirectory fai directory */
+ define ("FAI_LOG_DIR", "/var/cache/fusiondirectory/fai/"); /* FusionDirectory fai directory */
/* Directory containing the vacation files */
define ("VACATION_DIR", "/var/cache/fusiondirectory/vacation/"); /* FusionDirectory vacation directory */
--
GitLab