From: Holger Lindemann <hli@lenny.hoch.ul>
Date: Sat, 5 Mar 2011 10:17:49 +0000 (+0100)
Subject: Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.6.3~53^2~3^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=b3caa17585a69e0c5092483f709dd1227b9acaaf;hp=2c447b2fb419b504c90322b8d714360a174f8fa7;p=kivitendo-erp.git

Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
---

diff --git a/DEBIAN/DEBIAN/postinst b/DEBIAN/DEBIAN/postinst
index 5604cd99c..a681b98da 100755
--- a/DEBIAN/DEBIAN/postinst
+++ b/DEBIAN/DEBIAN/postinst
@@ -78,17 +78,14 @@ config_postgresql_sql_routines() {
 
 set_lx_office_erp_web_admin_password() {
 
-    	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
-	fi
 	db_get lx-office-erp/admin-password
 	ADMINPASSWORD="$RET"
 
-	cat /etc/lx-office-erp/lx_office.conf | \
-	sed --expression "s/admin_password = /admin_password = $ADMINPASSWORD/g" \
+	cat /etc/lx-office-erp/authentication.pl | \
+	sed --expression "s/{admin_password} = /{admin_password} = '$ADMINPASSWORD';#/g" \
 	> /tmp/1.txt
 
-	mv /tmp/1.txt /etc/lx-office-erp/lx_office.conf
+	mv /tmp/1.txt /etc/lx-office-erp/authentication.pl
 
 }
 
@@ -97,13 +94,13 @@ 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/lx_office.conf | \
-	sed --expression "s/^password = /password = $PASSWORD/g" \
+	cat /etc/lx-office-erp/authentication.pl | \
+	sed --expression "s/'password' => /'password' => '$PASSWORD', #/g" \
 	> /tmp/1.txt
 
 	cat /tmp/1.txt | \
 	sed --expression "s/^user = postgres/user = lxoffice/g" \
-	>  /etc/lx-office-erp/lx_office.conf
+	>  /etc/lx-office-erp/authentication.pl
 
 }
 
@@ -111,9 +108,12 @@ set_lx_office_erp_authentication_db_user_password() {
 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 /etc/lx-office-erp/lx-erp.conf
+	chown www-data:www-data /etc/lx-office-erp/authentication.pl
+	chown www-data:www-data /etc/lx-office-erp/console.conf
 	chown www-data:www-data /usr/lib/lx-office-erp/menu.ini
-	chmod 0600 /etc/lx-office-erp/lx_office.conf
+	chmod 0600 /etc/lx-office-erp/lx-erp.conf
+	chmod 0600 /etc/lx-office-erp/authentication.pl
 }
 
 disable_ipv6_on_lo_interface() {
@@ -142,20 +142,23 @@ 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
+    if ! [ -f /etc/lx-office-erp/lx-erp.conf ] ; then
+        cp /etc/lx-office-erp/lx-erp.conf.default /etc/lx-office-erp/lx-erp.conf
+    fi
+    if ! [ -f /etc/lx-office-erp/authentication.pl ] ; then
+	cp /etc/lx-office-erp/authentication.pl.default /etc/lx-office-erp/authentication.pl
+    fi
+    if ! [ -f /etc/lx-office-erp/console.conf ] ; then
+        cp /etc/lx-office-erp/console.conf.default /etc/lx-office-erp/console.conf
     fi
 }
 
 mk_links() {
-    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;
-    if ! [ -f /usr/lib/lx-office-erp/config/lx_office.conf.default ] ; then
-        ln -s /etc/lx-office-erp/lx_office.conf.default /usr/lib/lx-office-erp/config/lx_office.conf.default
+    if ! [ -f /usr/lib/lx-office-erp/config/lx-erp.conf ] ; then
+        ln -s /etc/lx-office-erp/lx-erp.conf /usr/lib/lx-office-erp/config/lx-erp.conf
     fi;
-    if [ -e /etc/lx-office-erp/authentication.pl ] ; then
-	rm /etc/lx-office-erp/authentication.pl
+    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 [ -e /etc/apache2 ] ; then
         if ! [ -f /etc/apache2/conf.d/lx-office-erp.apache2.conf ] ; then