X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=DEBIAN%2FDEBIAN%2Fpostinst;h=11095845fe3460776531203e56af444f53d99880;hb=61771309437ef49d25e592ea84fc750ec6c2e790;hp=7ad2abd9ce08c6c28fce71242c0551f31c0f3c0d;hpb=f13b7e717e9f5c4225e8700330775d16d2c4995e;p=kivitendo-erp.git

diff --git a/DEBIAN/DEBIAN/postinst b/DEBIAN/DEBIAN/postinst
index 7ad2abd9c..11095845f 100755
--- a/DEBIAN/DEBIAN/postinst
+++ b/DEBIAN/DEBIAN/postinst
@@ -82,6 +82,11 @@ mk_links() {
   for file in lx_office.conf lx_office.conf.default ; do
     test -f /usr/lib/lx-office-erp/config/${file} || ln -s /etc/lx-office-erp/${file} /usr/lib/lx-office-erp/config/${file}
   done
+  for file in lx-erp.conf authentication.pl ; do
+    if [ -f /usr/lib/lx-office-erp/config/${file} ] ; then
+      rm /usr/lib/lx-office-erp/config/${file}
+    fi
+  done
   if [ -e /etc/apache2 ] ; then
     if ! [ -f /etc/apache2/conf.d/lx-office-erp.apache2.conf ] ; then
       ln -s /etc/lx-office-erp/lx-office-erp.apache2.conf /etc/apache2/conf.d/lx-office-erp.apache2.conf
@@ -99,22 +104,43 @@ mk_links() {
     fi;
   fi;
 }
-reload_web_server() {
-  if [ -f /etc/init.d/apache* ] ; then
-    /etc/init.d/apache* reload
+web_server_ctrl() {
+  local action=$1
+  if [ -x "/etc/init.d/apache2" ]; then
+    if [ -x /usr/sbin/invoke-rc.d ]; then
+      invoke-rc.d apache2 $action ||true
+    else
+      /etc/init.d/apache2 $action ||true
+    fi
   fi
   if [ -f /etc/init.d/cherokee ] ; then
-    /etc/init.d/cherokee reload
+    /etc/init.d/cherokee $action || true
   fi
   if [ -f /etc/init.d/lighttpd ] ; then
-    /etc/init.d/lighttpd reload
+    /etc/init.d/lighttpd $action || true
+  fi
+
+  # if [ $action = restart ] ; then
+  #   echo Sleeping
+  #   sleep 5
+  #   echo Awake
+  # fi
+}
+
+enable_fcgi() {
+  if [ -x /usr/sbin/a2enmod -a -f /usr/lib/apache2/modules/mod_fcgid.so ] ; then
+    /usr/sbin/a2enmod fcgid
+    # web_server_ctrl restart
   fi
 }
+
 case "$1" in
 
   upgrade)
     echo " ! "`date`" $1 !" >> $debugfile
 
+    enable_fcgi
+
     VER=`cat /var/www/lx-office-erp/VERSION | cut -d '.' -f2`
     if [ $VER = '6' ]; then
       echo " ! 2.6 !" >> $debugfile
@@ -130,12 +156,18 @@ case "$1" in
     fi;
 
     set_user_rights
-    reload_web_server
+    ps auxw
+
+    db_stop || true
+    web_server_ctrl restart
+
     ;;
 
   install|configure)
     echo " ! "`date`" $1 !" >> $debugfile
 
+    enable_fcgi
+
     mk_new_menu
     mk_new_config
     config_postgresql_factory_script
@@ -144,7 +176,9 @@ case "$1" in
     mk_links
 
     set_user_rights
-    reload_web_server
+
+    db_stop || true
+    web_server_ctrl restart
 
     ;;