alternative Webserver

bug bei "older"

diff --git a/DEBIAN/DEBIAN/postinst b/DEBIAN/DEBIAN/postinst
index 0e0da13654df4968b8ca7c3b2aca4a4b4efca29e..b0a525cf0d0a8de9ace7d0ce81795fb53985808c 100755 (executable)
--- a/DEBIAN/DEBIAN/postinst
+++ b/DEBIAN/DEBIAN/postinst
@@ -176,6 +176,11 @@ mk_links() {
             ln -s /etc/lx-office-erp/lx-office-erp.cherokee /etc/cherokee/sites-available/lx-office-erp.cherokee
         fi;
     fi;
             ln -s /etc/lx-office-erp/lx-office-erp.cherokee /etc/cherokee/sites-available/lx-office-erp.cherokee
         fi;
     fi;

+    if [ -e /etc/lighttpd ] ; then 
+        if ! [ -f /etc/lighttpd/conf-enabled/lx-office-erp.lighttpd ] ; then
+            ln -s /etc/lx-office-erp/lx-office-erp.lighttpd /etc/lighttpf/conf-enabled/10-lx-office-erp
+        fi;
+    fi;

 }
 reload_web_server() {
     if [ -f /etc/init.d/apache* ] ; then 
 }
 reload_web_server() {
     if [ -f /etc/init.d/apache* ] ; then 


@@ -184,6 +189,9 @@ reload_web_server() {
     if [ -f /etc/init.d/cherokee ] ; then 
             /etc/init.d/cherokee reload
     fi
     if [ -f /etc/init.d/cherokee ] ; then 
             /etc/init.d/cherokee reload
     fi

+    if [ -f /etc/init.d/lighttpd ] ; then 
+            /etc/init.d/lighttpd reload
+    fi

 }
 case "$1" in
 
 }
 case "$1" in
 

diff --git a/DEBIAN/mk_erp_deb.sh b/DEBIAN/mk_erp_deb.sh
index 6093fe0ae33281cb1390820b00ff196d175b2ccb..5ee8357ed0e8da02485de231feae4b2428916a72 100755 (executable)
--- a/DEBIAN/mk_erp_deb.sh
+++ b/DEBIAN/mk_erp_deb.sh
@@ -15,7 +15,7 @@ DST=/tmp/package
 ################################################
 
 VER=`cat VERSION`
 ################################################
 
 VER=`cat VERSION`

-DEST=$DST/lx-office-erp_$VER-$NR-all
+DEST=$DST/lx-office-erp_$VER-$NR$1-all

 
 
 mkdir -p $DEST
 
 
 mkdir -p $DEST


@@ -26,7 +26,7 @@ cp -a $SRC/DEBIAN/DEBIAN .
 tar xzf $SRC/DEBIAN/struktur.tgz
 
 #Für Hardy + co Sonderbehandlung
 tar xzf $SRC/DEBIAN/struktur.tgz
 
 #Für Hardy + co Sonderbehandlung

-if [ "$1#" == "old#" ]; then
+if [ "$1#" == "-older#" ]; then

     mv DEBIAN/control.older DEBIAN/control
 else
     rm DEBIAN/control.older
     mv DEBIAN/control.older DEBIAN/control
 else
     rm DEBIAN/control.older


@@ -58,9 +58,9 @@ cp -a $SRC/xslt var/lib/lx-office-erp
 cp -a $SRC/doc/* usr/share/doc/lx-office-erp/
 cp -a $SRC/image/* usr/share/lx-office-erp/
 
 cp -a $SRC/doc/* usr/share/doc/lx-office-erp/
 cp -a $SRC/image/* usr/share/lx-office-erp/
 

-#Ist nicht im Repository. Bei Sven oder Holger erfragen.
-if [ "$1#" == "old#" ]; then
-    tar xzf $SRC/DEBIAN/missing_lib.tar.gz
+#Ist nicht im Repository. Liegt bei sf
+if [ "$1#" == "-older#" ]; then
+    tar xzf $SRC/DEBIAN/lx-erp-perl-libs-compat-v2.tar.gz

 fi
 
 #Git- und dummy-files löschen
 fi
 
 #Git- und dummy-files löschen


@@ -89,6 +89,6 @@ mv DEBIAN/1.tmp DEBIAN/control
 
 #Paket bauen:
 cd ..
 
 #Paket bauen:
 cd ..

-dpkg-deb --build lx-office-erp_$VER-$NR-all
+dpkg-deb --build lx-office-erp_$VER-$NR$1-all

 
 echo "Done"
 
 echo "Done"