summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--PKGBUILD4
-rw-r--r--fusiondirectory.install4
2 files changed, 5 insertions, 3 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 16ffbef635ba..ec2bda92a45c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -87,8 +87,8 @@ package() {
cp ./contrib/smarty/plugins/block.render.php $pkgdir/usr/share/php/smarty3/plugins/block.render.php
# Copy apache configuration
- install -d -m 0755 $pkgdir/etc/httpd/conf/extra/
- cp ./contrib/apache/fusiondirectory-apache.conf $pkgdir/etc/httpd/conf/extra/httpd-${pkgname}.conf
+ install -d -m 0755 $pkgdir/etc/fusiondirectory/
+ cp ./contrib/apache/fusiondirectory-apache.conf $pkgdir/etc/fusiondirectory/
# FusionDirectory install
install -d -m 0755 $pkgdir/usr/share/webapps/${pkgname}/
diff --git a/fusiondirectory.install b/fusiondirectory.install
index f695efe3aedd..d6cf82edd86c 100644
--- a/fusiondirectory.install
+++ b/fusiondirectory.install
@@ -1,11 +1,13 @@
post_install() {
- fusiondirectory-setup --update-cache --update-locales
+ # Create link for httpd-fusiondirectory.conf
+ ln -s /etc/fusiondirectory/fusiondirectory-apache.conf /etc/httpd/conf/extra/httpd-fusiondirectory.conf
echo '---------------------------------------------------------------------------'
echo 'Add this line in your /etc/httpd/conf/httpd.conf'
echo 'Include conf/extra/httpd-fusiondirectory.conf'
echo '---------------------------------------------------------------------------'
+ fusiondirectory-setup --update-cache --update-locales
fusiondirectory-setup --yes --check-directories
}