Merge branch 'master' into after-262

[kivitendo-erp.git] / DEBIAN / DEBIAN / postinst

diff --git a/DEBIAN/DEBIAN/postinst b/DEBIAN/DEBIAN/postinst
index 9d17536..02f5ac9 100755 (executable)
--- a/DEBIAN/DEBIAN/postinst
+++ b/DEBIAN/DEBIAN/postinst
@@ -81,17 +81,12 @@ set_lx_office_erp_web_admin_password() {
        db_get lx-office-erp/admin-password
        ADMINPASSWORD="$RET"
 
-       #cat /usr/lib/lx-office-erp/config/authentication.pl.default | \
        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 /usr/lib/lx-office-erp/config/authentication.pl
        mv /tmp/1.txt /etc/lx-office-erp/authentication.pl
 
-       #chmod 0600 /usr/lib/lx-office-erp/config/authentication.pl
-       #chown www-data:www-data /usr/lib/lx-office-erp/config/authentication.pl
-
 }
 
 
@@ -99,12 +94,10 @@ set_lx_office_erp_authentication_db_password() {
        db_get lx-office-erp/lx-office-erp-user-postgresql-password
        PASSWORD="$RET"
 
-       #cat /usr/lib/lx-office-erp/config/authentication.pl | \
        cat /etc/lx-office-erp/authentication.pl | \
        sed --expression "s/'password' => '',/'password' => '$PASSWORD',/g" \
        > /tmp/1.txt
 
-       #mv /tmp/1.txt /usr/lib/lx-office-erp/config/authentication.pl
        mv /tmp/1.txt /etc/lx-office-erp/authentication.pl
 
 }
@@ -112,23 +105,21 @@ set_lx_office_erp_authentication_db_password() {
 set_lx_office_erp_authentication_db_user() {
        USER="lxoffice"
 
-       #cat /usr/lib/lx-office-erp/config/authentication.pl | \
        cat /etc/lx-office-erp/authentication.pl | \
        sed --expression "s/'user'     => 'postgres',/'user'     => '$USER',/g" \
        > /tmp/1.txt
 
-       #mv /tmp/1.txt /usr/lib/lx-office-erp/config/authentication.pl
        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
+       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() {