X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=DEBIAN%2FDEBIAN%2Fpostinst;h=06295233a9271b6024221d7f53be8de040e415b0;hb=2d2cd458e04c0036d10f0fc689a2f4d6e7d7a9f7;hp=97acf8a283b9d715ab2553f8ddf4b94787d72bd4;hpb=3a94f4d2dd9a835d4a7007e1b999ea00b3c4e1cd;p=kivitendo-erp.git

diff --git a/DEBIAN/DEBIAN/postinst b/DEBIAN/DEBIAN/postinst
index 97acf8a28..06295233a 100755
--- a/DEBIAN/DEBIAN/postinst
+++ b/DEBIAN/DEBIAN/postinst
@@ -77,52 +77,32 @@ config_postgresql_sql_routines() {
 
 
 set_lx_office_erp_web_admin_password() {
-
 	db_get lx-office-erp/admin-password
 	ADMINPASSWORD="$RET"
 
-	cat /etc/lx-office-erp/authentication.pl.default | \
-	sed --expression "s/\$self->{admin_password} = 'admin';/\$self->{admin_password} = '$ADMINPASSWORD';/g" \
-	> /tmp/1.txt
-
-	mv /tmp/1.txt /etc/lx-office-erp/authentication.pl
-
+	sed --in-place --expression "s/^admin_password.*=.*/admin_password = $ADMINPASSWORD/" /etc/lx-office-erp/lx_office.conf
 }
 
 
-set_lx_office_erp_authentication_db_password() {
+set_lx_office_erp_authentication_db_user_password() {
 	db_get lx-office-erp/lx-office-erp-user-postgresql-password
 	PASSWORD="$RET"
 
-	cat /etc/lx-office-erp/authentication.pl | \
-	sed --expression "s/'password' => '',/'password' => '$PASSWORD',/g" \
-	> /tmp/1.txt
-
-	mv /tmp/1.txt /etc/lx-office-erp/authentication.pl
-
+	sed --in-place --expression "s/^password.*=.*/password = $PASSWORD/" /etc/lx-office-erp/lx_office.conf
+	sed --in-place --expression "s/^user.*=.*postgres/user = lxoffice/g" /etc/lx-office-erp/lx_office.conf
 }
 
-set_lx_office_erp_authentication_db_user() {
-	USER="lxoffice"
-
-	cat /etc/lx-office-erp/authentication.pl | \
-	sed --expression "s/'user'     => 'postgres',/'user'     => '$USER',/g" \
-	> /tmp/1.txt
-
-	mv /tmp/1.txt /etc/lx-office-erp/authentication.pl
-}
 
 set_user_rights() {
 	chown -R www-data:www-data /usr/lib/lx-office-erp/users
 	chown -R www-data:www-data /usr/lib/lx-office-erp/templates
 	chown www-data:www-data /etc/lx-office-erp/lx_office.conf
 	chown www-data:www-data /usr/lib/lx-office-erp/menu.ini
-	chown www-data:www-data /etc/lx-office-erp/authentication.pl
 	chmod 0600 /etc/lx-office-erp/lx_office.conf
-	chmod 0600 /etc/lx-office-erp/authentication.pl
 }
 
 disable_ipv6_on_lo_interface() {
+        #Ist wohl nicht mehr notwendig.
 	# 2009-04-25
         # Perls Libraries are not yet ipv6 read
         echo "WICHTIG: ipv6 ist nunmehr auf dem Loopback-Interface deaktiviert, um die Funktionsfähigkeit von Lx-Office-ERP zu gewährleisten!"
@@ -148,17 +128,14 @@ mk_new_menu() {
 
 mk_new_config() {
     if ! [ -f /etc/lx-office-erp/lx_office.conf ] ; then
-        cp /etc/lx-office-erp/lx_office.conf.default /etc/lx-office-erp/lx_office.conf
+	cp /etc/lx-office-erp/lx_office.conf.default /etc/lx-office-erp/lx_office.conf
     fi
 }
 
 mk_links() {
-    if ! [ -f /usr/lib/lx-office-erp/config/authentication.pl ] ; then
-        ln -s /etc/lx-office-erp/authentication.pl /usr/lib/lx-office-erp/config/authentication.pl
-    fi;
     if ! [ -f /usr/lib/lx-office-erp/config/lx_office.conf ] ; then
         ln -s /etc/lx-office-erp/lx_office.conf /usr/lib/lx-office-erp/config/lx_office.conf
-    fi;
+    fi
     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
@@ -193,18 +170,17 @@ case "$1" in
         echo " ! "`date`" $1 !" >> /tmp/lxo-erp.log
 
         VER=`cat /var/www/lx-office-erp/VERSION | cut -d '.' -f2`
-        if [ $VER = '6' ]; then
-            echo " ! 2.6 !" >> /tmp/lxo-erp.log
-            echo "Version 2.6"
+        if [ $VER = '7' ]; then
+            echo " ! 2.7 !" >> /tmp/lxo-erp.log
+            echo "Version 2.7.x"
             mk_new_menu
         else
             mk_new_menu
             mk_new_config
             config_postgresql_factory_script
             set_lx_office_erp_web_admin_password
-            set_lx_office_erp_authentication_db_user
-            set_lx_office_erp_authentication_db_password
-	        disable_ipv6_on_lo_interface
+            set_lx_office_erp_authentication_db_user_password
+	    #  disable_ipv6_on_lo_interface
             mk_links
         fi;
 
@@ -219,9 +195,8 @@ case "$1" in
         mk_new_config
         config_postgresql_factory_script
         set_lx_office_erp_web_admin_password
-        set_lx_office_erp_authentication_db_user
-        set_lx_office_erp_authentication_db_password
-        disable_ipv6_on_lo_interface
+        set_lx_office_erp_authentication_db_user_password
+        # disable_ipv6_on_lo_interface
         mk_links
 
         set_user_rights