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

diff --combined DEBIAN/DEBIAN/postinst
index 87176a8,97acf8a..993148f
--- 1/DEBIAN/DEBIAN/postinst
--- 2/DEBIAN/DEBIAN/postinst
+++ b/DEBIAN/DEBIAN/postinst
@@@ -115,15 -115,14 +115,15 @@@ set_lx_office_erp_authentication_db_use
  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/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-erp.conf
+       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!"
@@@ -136,42 -135,36 +136,36 @@@
  
  }
  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/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/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
+     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/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 [ -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 -177,10 +178,10 @@@
      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 
@@@ -211,7 -204,7 +205,7 @@@ case "$1" i
              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
 +          #  disable_ipv6_on_lo_interface
              mk_links
          fi;
  
@@@ -221,14 -214,14 +215,14 @@@
  
      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
 -        disable_ipv6_on_lo_interface
 +        # disable_ipv6_on_lo_interface
          mk_links
  
          set_user_rights