index d607d612032ec238b9bef0fdcc504c3ba812f1a6..ae1081d9382b71442a7c5841902027606b9ef640 100644 (file)
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
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