From 1f24bdb531ed56aa17c374272deb1a5630240ee0 Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Wed, 6 May 2020 14:54:10 +0200 Subject: [PATCH] Fix default configuration delivered with the application --- debian/conf/apache.conf | 3 ++- debian/rules | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/conf/apache.conf b/debian/conf/apache.conf index 903e46a4..b0312045 100644 --- a/debian/conf/apache.conf +++ b/debian/conf/apache.conf @@ -5,5 +5,6 @@ Alias /ldapsaisie /usr/share/ldapsaisie/public_html php_flag magic_quotes_gpc Off php_flag register_globals Off - Options -Indexes +FollowSymLinks + Options -Indexes +FollowSymLinks + AllowOverride FileInfo diff --git a/debian/rules b/debian/rules index 03983142..dc15d309 100755 --- a/debian/rules +++ b/debian/rules @@ -13,9 +13,18 @@ override_dh_clean: override_dh_install: dh_install -X .gitignore -X .placefolder -X tmp + # Move local directory as /usr/local/share/ldapsaisie + # Note: a symbolic link will be install by dh_link mv $(CURDIR)/debian/ldapsaisie/usr/share/ldapsaisie/local $(CURDIR)/debian/ldapsaisie/usr/local/share/ldapsaisie + # Remove all files in local directory find $(CURDIR)/debian/ldapsaisie/usr/local/share/ldapsaisie -type f -exec rm -f \{\} \; + + # Change default log file path sed -i 's/tmp\/LS.log/\/var\/log\/ldapsaisie\/ldapsaisie.log/' $(CURDIR)/debian/ldapsaisie/usr/share/ldapsaisie/conf/config.inc.php + # Change default public_root_url + sed -i "s/^\(\s*'public_root_url' => \).*/\1'\/ldapsaisie\/',/" $(CURDIR)/debian/ldapsaisie/usr/share/ldapsaisie/conf/config.inc.php + + # Make a copy of default config.inc.php to /usr/local/share/ldapsaisie/conf/config.inc.example.php (=/etc/ldapsaisie/local/conf/config.inc.php) cp $(CURDIR)/debian/ldapsaisie/usr/share/ldapsaisie/conf/config.inc.php $(CURDIR)/debian/ldapsaisie/usr/local/share/ldapsaisie/conf/config.inc.example.php override_dh_usrlocal: