X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fdebian%2Fgosa.postinst;h=ae1081d9382b71442a7c5841902027606b9ef640;hb=5eb351d44a10e1315cba393a894348906934e06b;hp=622d1c2203251b428633aaeba257047766169210;hpb=4527f7c4eb4dcd0de8b9a3e535120cfa037061c7;p=gosa.git

diff --git a/gosa-core/debian/gosa.postinst b/gosa-core/debian/gosa.postinst
index 622d1c220..ae1081d93 100644
--- a/gosa-core/debian/gosa.postinst
+++ b/gosa-core/debian/gosa.postinst
@@ -27,16 +27,23 @@ WEBGROUP="www-data"
 # Create empty inclusion file for apache
 if [ ! -f /etc/gosa/gosa.secrets ]; then
     touch /etc/gosa/gosa.secrets
-    chown root.root /etc/gosa/gosa.secrets
     chmod 600 /etc/gosa/gosa.secrets
 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
+
+  # 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
-  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
@@ -48,15 +55,16 @@ for source in /usr/bin/convert /usr/bin/lpstat; do
   fi
 done
 
-# Fix permission in /var/spool/gosa
+# Fix permission in /var/(spool|cache)/gosa
 chown root.$WEBGROUP -R /var/spool/gosa
 chmod 770 -R /var/spool/gosa
+chown root.$WEBGROUP -R /var/cache/gosa
+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