From: Holger Lindemann Date: Fri, 3 Jun 2011 15:03:46 +0000 (+0200) Subject: Anpassung an neues Conffile, Abhängigkeiten X-Git-Tag: release-2.6.3~24 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=9e33e9daa2d3fc4c1ca1795cddfc59766ed0f429;p=kivitendo-erp.git Anpassung an neues Conffile, Abhängigkeiten --- diff --git a/DEBIAN/DEBIAN/conffiles b/DEBIAN/DEBIAN/conffiles index 1a88f8fcf..8f29d1652 100644 --- a/DEBIAN/DEBIAN/conffiles +++ b/DEBIAN/DEBIAN/conffiles @@ -1,6 +1,5 @@ /etc/lx-office-erp/lx-office-erp.apache2.conf /etc/lx-office-erp/lx-office-erp.cherokee /etc/lx-office-erp/lx-office-erp.cherokee.handler -/etc/lx-office-erp/lx-erp.conf.default /etc/lx-office-erp/console.conf.default -/etc/lx-office-erp/authentication.pl.default +/etc/lx-office-erp/lx_office.conf.default diff --git a/DEBIAN/DEBIAN/control b/DEBIAN/DEBIAN/control index b5523a6b3..a6494a22f 100644 --- a/DEBIAN/DEBIAN/control +++ b/DEBIAN/DEBIAN/control @@ -5,8 +5,8 @@ Section: universe/web Priority: optional Installed-Size: 0 Maintainer: Holger Lindemann , Adrian Weibel -Depends: patch, apache2 | apache | lighttpd, postgresql-8.3 | postgresql-8.4, libdbi-perl, libdbd-pg-perl, libpg-perl, libarchive-zip-perl, libyaml-perl, libio-stringy-perl, libtemplate-perl, libpdf-api2-perl, libcgi-ajax-perl, liblist-moreutils-perl, libxml-writer-perl, libtext-csv-xs-perl | libtext-csv-perl, liburi-perl, libdatetime-perl, libtext-iconv-perl, libclass-accessor-perl,libemail-address-perl,libparent-perl, librose-object-perl, librose-db-perl, librose-db-object-perl -Suggests: tetex-base | texlive-latex-base, tetex-bin | texlive-base-bin , tetex-extra | texlive-latex-extra, xpdf | evince | okular, libfcgi-perl, libapache2-mod-fastcgi +Depends: patch, apache2 | apache | lighttpd, postgresql-8.3 | postgresql-8.4, libdbi-perl, libdbd-pg-perl, libpg-perl, libarchive-zip-perl, libyaml-perl, libio-stringy-perl, libtemplate-perl, libpdf-api2-perl, libcgi-ajax-perl, liblist-moreutils-perl, libxml-writer-perl, libtext-csv-xs-perl | libtext-csv-perl, liburi-perl, libdatetime-perl, libtext-iconv-perl, libclass-accessor-perl,libemail-address-perl,libparent-perl, librose-object-perl, librose-db-perl, librose-db-object-perl,libsort-naturally-perl,libparams-validate-perl,libfcgi-perl +Suggests: tetex-base | texlive-latex-base, tetex-bin | texlive-base-bin , tetex-extra | texlive-latex-extra, xpdf | evince | okular, libapache2-mod-fastcgi Homepage: http://www.lx-office.org Description: Extended double entry accounting system for the german market. Lx-Office is derived from sql-ledger and rewritten diff --git a/DEBIAN/DEBIAN/postinst b/DEBIAN/DEBIAN/postinst index a681b98da..c0fd4f8fb 100755 --- a/DEBIAN/DEBIAN/postinst +++ b/DEBIAN/DEBIAN/postinst @@ -81,11 +81,11 @@ set_lx_office_erp_web_admin_password() { db_get lx-office-erp/admin-password ADMINPASSWORD="$RET" - cat /etc/lx-office-erp/authentication.pl | \ - sed --expression "s/{admin_password} = /{admin_password} = '$ADMINPASSWORD';#/g" \ + cat /etc/lx-office-erp/lx_office.conf | \ + sed --expression "s/{admin_password} = /{admin_password} = $ADMINPASSWORD/g" \ > /tmp/1.txt - mv /tmp/1.txt /etc/lx-office-erp/authentication.pl + mv /tmp/1.txt /etc/lx-office-erp/lx_office.conf } @@ -94,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/authentication.pl | \ - sed --expression "s/'password' => /'password' => '$PASSWORD', #/g" \ + cat /etc/lx-office-erp/lx_office.conf | \ + 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/authentication.pl + > /etc/lx-office-erp/lx_office.conf } @@ -108,12 +108,9 @@ 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-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 /etc/lx-office-erp/lx_office.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 + chmod 0600 /etc/lx-office-erp/lx_office.conf } disable_ipv6_on_lo_interface() { @@ -142,23 +139,14 @@ mk_new_menu() { } 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 + 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 } mk_links() { - 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/authentication.pl ] ; then - ln -s /etc/lx-office-erp/authentication.pl /usr/lib/lx-office-erp/config/authentication.pl + 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 [ -e /etc/apache2 ] ; then if ! [ -f /etc/apache2/conf.d/lx-office-erp.apache2.conf ] ; then @@ -194,9 +182,9 @@ 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.x" + if [ $VER = '7' ]; then + echo " ! 2.7 !" >> /tmp/lxo-erp.log + echo "Version 2.7.x" mk_new_menu else mk_new_menu