X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=DEBIAN%2FDEBIAN%2Fpostinst;h=a681b98da8205a19db9b24848d08628b2507c2f5;hb=7b5835061e81d1af578e1572e435d6f3e61d2989;hp=87176a82e2fe9b359c53278d3c77cee113bfafb1;hpb=23b7f032d2452654e58ed12489ac92483370f7bd;p=kivitendo-erp.git diff --git a/DEBIAN/DEBIAN/postinst b/DEBIAN/DEBIAN/postinst index 87176a82e..a681b98da 100755 --- a/DEBIAN/DEBIAN/postinst +++ b/DEBIAN/DEBIAN/postinst @@ -81,8 +81,8 @@ 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" \ + 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/authentication.pl @@ -90,34 +90,28 @@ set_lx_office_erp_web_admin_password() { } -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" \ + sed --expression "s/'password' => /'password' => '$PASSWORD', #/g" \ > /tmp/1.txt - mv /tmp/1.txt /etc/lx-office-erp/authentication.pl + cat /tmp/1.txt | \ + sed --expression "s/^user = postgres/user = lxoffice/g" \ + > /etc/lx-office-erp/authentication.pl } -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-erp.conf - chown www-data:www-data /usr/lib/lx-office-erp/menu.ini 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-erp.conf chmod 0600 /etc/lx-office-erp/authentication.pl } @@ -136,42 +130,42 @@ disable_ipv6_on_lo_interface() { } mk_new_menu() { - if [ -e /usr/lib/lx-office-crm ] ; then + if [ -e /usr/lib/lx-office-crm ] ; then #crm vorhanden, dann die menu.ini mit der höchsten VersNr nehmen - for i in `ls -1 /usr/lib/lx-office-crm/update/menu*ini` ; do + for i in `ls -1 /usr/lib/lx-office-crm/update/menu*ini` ; do cat $i > /usr/lib/lx-office-erp/menu.ini done; cat /usr/lib/lx-office-erp/menu.default >> /usr/lib/lx-office-erp/menu.ini else cp /usr/lib/lx-office-erp/menu.default /usr/lib/lx-office-erp/menu.ini fi -} +} mk_new_config() { 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/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-erp.conf ] ; then ln -s /etc/lx-office-erp/lx-erp.conf /usr/lib/lx-office-erp/config/lx-erp.conf fi; - if ! [ -f /usr/lib/lx-office-erp/config/console.conf ] ; then - ln -s /etc/lx-office-erp/console.conf /usr/lib/lx-office-erp/config/console.conf - fi; - if [ -e /etc/apache2 ] ; then + 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 ln -s /etc/lx-office-erp/lx-office-erp.apache2.conf /etc/apache2/conf.d/lx-office-erp.apache2.conf fi; fi; - if [ -e /etc/cherokee/sites-available ] ; then + if [ -e /etc/cherokee/sites-available ] ; then if ! [ -f /etc/cherokee/sites-available/lx-office-erp.cherokee ] ; then cat /etc/lx-office-erp/lx-office-erp.cherokee.handler >> /etc/cherokee/sites-available/default ln -s /etc/lx-office-erp/lx-office-erp.cherokee /etc/cherokee/sites-available/lx-office-erp.cherokee @@ -184,10 +178,10 @@ mk_links() { fi; } reload_web_server() { - if [ -f /etc/init.d/apache* ] ; then + if [ -f /etc/init.d/apache* ] ; then /etc/init.d/apache* reload fi - if [ -f /etc/init.d/cherokee ] ; then + if [ -f /etc/init.d/cherokee ] ; then /etc/init.d/cherokee reload fi if [ -f /etc/init.d/lighttpd ] ; then @@ -202,15 +196,14 @@ case "$1" in 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" + echo "Version 2.6.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 + set_lx_office_erp_authentication_db_user_password # disable_ipv6_on_lo_interface mk_links fi; @@ -221,13 +214,12 @@ case "$1" in install|configure) echo " ! "`date`" $1 !" >> /tmp/lxo-erp.log - + 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 + set_lx_office_erp_authentication_db_user_password # disable_ipv6_on_lo_interface mk_links