From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 14 Apr 2008 15:47:46 +0000 (+0000)
Subject: Made installation script trigger on links
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1164b82972575c6389707407a1b11ccc066e2028;p=gosa.git

Made installation script trigger on links


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10439 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/debian/gosa.install b/gosa-core/debian/gosa.install
index 584eb2f91..fc1a0cfb7 100644
--- a/gosa-core/debian/gosa.install
+++ b/gosa-core/debian/gosa.install
@@ -7,6 +7,7 @@ plugins				/usr/share/gosa
 setup				/usr/share/gosa
 debian/overrides-linda		/usr/share/linda/overrides/gosa
 debian/overrides-lintian	/usr/share/lintian/overrides/gosa
+debian/gosa-apache.conf /etc/gosa
 contrib/shells			/etc/gosa
 contrib/encodings		/etc/gosa
 contrib/openldap/slapd.conf	/usr/share/doc/gosa/slapd.conf-example
diff --git a/gosa-core/debian/gosa.postinst b/gosa-core/debian/gosa.postinst
index c35f0958f..e68ba154e 100644
--- a/gosa-core/debian/gosa.postinst
+++ b/gosa-core/debian/gosa.postinst
@@ -31,11 +31,11 @@ if [ ! -f /etc/gosa/gosa.secrets ]; then
 fi
 
 # Copy GOsa configuration to conf.d directories
-if [ ! -f /etc/apache2/conf.d/gosa.conf ]; then
+if [ ! -L /etc/apache2/conf.d/gosa.conf ]; then
   echo "Making /gosa available in /etc/apache2/conf.d"
 
   # Add GOsa include file
-  ln -s /etc/gosa/apache-gosa.conf /etc/apache2/conf.d/gosa.conf
+  ln -s /etc/gosa/gosa-apache.conf /etc/apache2/conf.d/gosa.conf
 fi
 
 # Add links for safe mode