Updated json Rop and RPC again

[gosa.git] / gosa-core / debian / gosa.postinst

diff --git a/gosa-core/debian/gosa.postinst b/gosa-core/debian/gosa.postinst
index c35f0958fc487ce5e429326c0ffdf10434cb0002..c5be1424318a1c5d28c3ca5c84625770b6bbcb9d 100644 (file)
--- a/gosa-core/debian/gosa.postinst
+++ b/gosa-core/debian/gosa.postinst
@@ -12,6 +12,11 @@ case "$1" in
   abort-upgrade|abort-remove|abort-deconfigure)
       ;;
 
+  triggered)
+      /usr/sbin/update-gosa
+      exit 0
+      ;;
+
   *)
       echo "postinst called with unknown argument \`$1'" >&2
       exit 1
@@ -30,12 +35,60 @@ if [ ! -f /etc/gosa/gosa.secrets ]; then
     chmod 600 /etc/gosa/gosa.secrets
 fi
 
-# Copy GOsa configuration to conf.d directories
-if [ ! -f /etc/apache2/conf.d/gosa.conf ]; then
-  echo "Making /gosa available in /etc/apache2/conf.d"
+if [ -d /etc/apache2/conf.d ]; then
+
+  # 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
+    ln -s /etc/gosa/gosa-apache.conf /etc/apache2/conf.d/gosa.conf
+  fi
+  
+  # Add support for RequestHeader
+  a2enmod headers
+
+  # Finally restart servers
+  if [ -x /usr/sbin/invoke-rc.d ]; then
+    invoke-rc.d apache2 reload
+  else
+    /etc/init.d/apache2 reload
+  fi
+fi
+
+if [ -d /etc/lighttpd/conf-available ]; then
+
+  # Copy GOsa configuration to conf-available directories /etc/lighttpd/conf-available
+  if [ ! -L /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf ]; then
+
+    # Remove old instances of this file
+    if [ -f /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf ]; then
+      echo "Found old gosa apache configuration in /etc/lighttpd/conf-enabled - moving it to orig.gosa-lighttpd.conf ..."
+      echo "Please check for changes in /etc/lighttpd/conf-available/orig.99gosa-lighttpd.conf if you modified this file!"
+      mv /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf /etc/lighttpd/conf-available/orig.gosa-lighttpd.conf
+    fi
+
+    echo "Making /gosa available in /etc/lighttpd/conf-enabled/"
+
+    # Add GOsa include file
+    ln -s /etc/gosa/gosa-lighttpd.conf /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf
+  fi
+
+  # Finally restart servers
+  if [ -x /usr/sbin/invoke-rc.d ]; then
+    invoke-rc.d lighttpd reload
+  else
+    /etc/init.d/lighttpd reload
+  fi
 
-  # Add GOsa include file
-  ln -s /etc/gosa/apache-gosa.conf /etc/apache2/conf.d/gosa.conf
 fi
 
 # Add links for safe mode
@@ -53,18 +106,6 @@ 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
-
-# Finally restart servers
-if [ -x /usr/sbin/invoke-rc.d ]; then
-  invoke-rc.d apache2 reload
-else
-  /etc/init.d/apache2 reload
-fi
+update-gosa
 
 exit 0
-