X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fdebian%2Fgosa.postinst;h=ae1081d9382b71442a7c5841902027606b9ef640;hb=f1ec8af680b94601b3fc5136957aaf398c814984;hp=e68ba154e075b24b07a10506e0c81af0c4e1e7ad;hpb=1164b82972575c6389707407a1b11ccc066e2028;p=gosa.git

diff --git a/gosa-core/debian/gosa.postinst b/gosa-core/debian/gosa.postinst
index e68ba154e..ae1081d93 100644
--- a/gosa-core/debian/gosa.postinst
+++ b/gosa-core/debian/gosa.postinst
@@ -32,6 +32,14 @@ fi
 
 # Copy GOsa configuration to conf.d directories
 if [ ! -L /etc/apache2/conf.d/gosa.conf ]; then
+
+  # Remove old instances of this file
+  if [ -f /etc/apache2/conf.d/gosa.conf ]; then
+    echo "Found old gosa apache configuration in /etc/apache2/conf.d - moving it to gosa.conf.orig..."
+    echo "Please check for changes in /etc/gosa/gosa-apache.conf if you modified this file!"
+    mv /etc/apache2/conf.d/gosa.conf /etc/apache2/conf.d/gosa.conf.orig
+  fi
+
   echo "Making /gosa available in /etc/apache2/conf.d"
 
   # Add GOsa include file
@@ -56,8 +64,7 @@ chmod 770 -R /var/cache/gosa
 # Add support for RequestHeader
 a2enmod headers
 
-# Update gosa
-/usr/sbin/update-gosa
+update-gosa
 
 # Finally restart servers
 if [ -x /usr/sbin/invoke-rc.d ]; then