From 06652f19ce9a0274ab931af719dec52e97fb2458 Mon Sep 17 00:00:00 2001 From: Holger Lindemann Date: Thu, 27 Jan 2011 08:59:38 +0100 Subject: [PATCH] Struktur in Tar-File gepackt MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Script zum Paketbau geändert --- DEBIAN/DEBIAN/conffiles | 3 + DEBIAN/DEBIAN/postinst | 25 ++++---- DEBIAN/files/lx-office-erp | 9 --- DEBIAN/files/lx-office-erp.1.gz | Bin 896 -> 0 bytes DEBIAN/files/lx-office-erp.apache2.conf | 14 ----- DEBIAN/files/lx-office-erp.cherokee | 25 -------- DEBIAN/files/lx-office-erp.cherokee.handler | 3 - DEBIAN/mk_erp_deb.sh | 66 ++------------------ DEBIAN/struktur.tgz | Bin 0 -> 2762 bytes 9 files changed, 19 insertions(+), 126 deletions(-) delete mode 100755 DEBIAN/files/lx-office-erp delete mode 100644 DEBIAN/files/lx-office-erp.1.gz delete mode 100644 DEBIAN/files/lx-office-erp.apache2.conf delete mode 100644 DEBIAN/files/lx-office-erp.cherokee delete mode 100644 DEBIAN/files/lx-office-erp.cherokee.handler create mode 100644 DEBIAN/struktur.tgz diff --git a/DEBIAN/DEBIAN/conffiles b/DEBIAN/DEBIAN/conffiles index 4cb0a3b35..1a88f8fcf 100644 --- a/DEBIAN/DEBIAN/conffiles +++ b/DEBIAN/DEBIAN/conffiles @@ -1,3 +1,6 @@ /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 diff --git a/DEBIAN/DEBIAN/postinst b/DEBIAN/DEBIAN/postinst index 54b53e5da..0e0da1365 100755 --- 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-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 - chmod 0600 /etc/lx-office-erp/lx-erp.conf - chmod 0600 /etc/lx-office-erp/authentication.pl + 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 + chmod 0600 /etc/lx-office-erp/lx-erp.conf + chmod 0600 /etc/lx-office-erp/authentication.pl } disable_ipv6_on_lo_interface() { @@ -159,6 +150,9 @@ 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 + fi } mk_links() { @@ -168,6 +162,9 @@ 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/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 /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 diff --git a/DEBIAN/files/lx-office-erp b/DEBIAN/files/lx-office-erp deleted file mode 100755 index 7f41914ea..000000000 --- a/DEBIAN/files/lx-office-erp +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# -## shell script for lx-office-erp to start the login manager in a browser - -set -e - -/usr/bin/sensible-browser http://localhost/lx-office-erp/login.pl - - diff --git a/DEBIAN/files/lx-office-erp.1.gz b/DEBIAN/files/lx-office-erp.1.gz deleted file mode 100644 index d68e3a64afbb85b58309fadff39998c1b855f52d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 896 zcmV-`1AqJ^qBL%s#E5d(0=ZDqP+~%nDoI7vkN4ae%68&*4{N}X#2LPM^Z16@-2wcs-vv$! z$S+S$i(^P%reK_vlHZbyAkLNZ0eay?hXLIJu1+rV1^Ctux`q-#XbqLPYL5l_- zsieb4<&|kD7HjmP!Hl=gjoA(%3e$V&xp$EJLtRl4f(RAnl!M+CVH_qm19slE2fEN^9zM z4omeLrM+nBwo$@E7l1+tr9<&BC-@%TnfK2U%wI=Js$w(G4y6R6E{E_s$0 zr#GuLyFR&PpHXXr(7?SzZL6WWRVsBu59yiwVKg?%Ig03H`GlsIu!yMC?_~mJY-O)PSo5k`G;npLS|*4C5RH~ zrD}y~2$FUPXq=5oB%7){q~yX5F#zEcUz&^WgK{`GN}@_-gsBvX;H?ZJjdT{Jx{fLp zBop$K)8AOIJ55+*yqC`{ls=^AkcI?H@ZJB0m%iwd?( z+D2EZknrYKJR&c}T5O=%QBO_q_tqLS30QxP7goGtXm7F{yj%K~L|Rhja - Options ExecCGI Includes FollowSymlinks - DirectoryIndex login.pl - AddDefaultCharset UTF-8 - - - - Order Deny,Allow - Deny from All - \ No newline at end of file diff --git a/DEBIAN/files/lx-office-erp.cherokee b/DEBIAN/files/lx-office-erp.cherokee deleted file mode 100644 index 6ea1e95be..000000000 --- a/DEBIAN/files/lx-office-erp.cherokee +++ /dev/null @@ -1,25 +0,0 @@ -## -## Virtual server for lx-office-erp -## -Directory /lx-office-erp { - Handler common - DocumentRoot /usr/lib/lx-office-erp/ -} -Directory /lx-office-erp/image { - DocumentRoot /usr/share/lx-office-erp/ -} -Directory /lx-office-erp/css{ - DocumentRoot /var/lib/lx-office-erp/css -} -Directory /lx-office-erp/templates{ - DocumentRoot /var/lib/lx-office-erp/templates -} -Directory /lx-office-erp/users{ - DocumentRoot /var/lib/lx-office-erp/users -} -Directory /lx-office-erp/webdav{ - DocumentRoot /var/lib/lx-office-erp/webdav -} -Directory /lx-office-erp/spool{ - DocumentRoot /var/lib/lx-office-erp/spool -} diff --git a/DEBIAN/files/lx-office-erp.cherokee.handler b/DEBIAN/files/lx-office-erp.cherokee.handler deleted file mode 100644 index c932e3c12..000000000 --- a/DEBIAN/files/lx-office-erp.cherokee.handler +++ /dev/null @@ -1,3 +0,0 @@ -Extension pl { - Handler cgi -} diff --git a/DEBIAN/mk_erp_deb.sh b/DEBIAN/mk_erp_deb.sh index 60fe00ef7..4fb7c008e 100755 --- a/DEBIAN/mk_erp_deb.sh +++ b/DEBIAN/mk_erp_deb.sh @@ -4,10 +4,10 @@ NR="0" #hier wurde das Git-Paket entpakt: -SRC=/tmp/deb_test/unstable +SRC=/tmp/lx-office-erp #hier wird das Debian-Paket gebaut: -DST=/tmp/deb_test/package +DST=/tmp/package ################################################ @@ -17,70 +17,13 @@ DST=/tmp/deb_test/package VER=`cat VERSION` DEST=$DST/lx-office-erp_$VER-$NR-all -FILES=' -usr/lib/lx-office-erp/ -usr/share/lx-office-erp/ -usr/share/doc/lx-office-erp/ -var/lib/lx-office-erp/spool/ -var/lib/lx-office-erp/users/ -var/lib/lx-office-erp/css/ -var/lib/lx-office-erp/xslt/ -var/lib/lx-office-erp/templates/ -var/lib/lx-office-erp/webdav/lieferantenbestellungen/ -var/lib/lx-office-erp/webdav/anfragen/ -var/lib/lx-office-erp/webdav/gutschriften/ -var/lib/lx-office-erp/webdav/einkaufsrechnungen/ -var/lib/lx-office-erp/webdav/rechnungen/ -var/lib/lx-office-erp/webdav/bestellungen/ -var/lib/lx-office-erp/webdav/angebote/ -usr/lib/lx-office-erp/ -usr/share/lx-office-erp/ -usr/share/doc/lx-office-erp/ -usr/share/man/man1/:lx-office-erp.1.gz -etc/lx-office-erp/:lx-office-erp.cherokee.handler -etc/lx-office-erp/:lx-office-erp.apache2.conf -etc/lx-office-erp/:lx-office-erp.cherokee -usr/bin/:lx-office-erp -' - -for filespec in $FILES; do - set - `echo $filespec | sed -e 's/:/ /g'` - dir=$1 - file=$2 - mkdir -p $SRC/DEBIAN/$dir - if [ -f $SRC/DEBIAN/files/$file ]; then - cp $SRC/DEBIAN/files/$file $SRC/DEBIAN/$dir/$file - else - echo '1' > $SRC/DEBIAN/$dir/.dummy - fi -done - -SYMLINKS=' -css:/var/lib/lx-office-erp/css -doc:/usr/share/doc/lx-office-erp/ -image:/usr/share/lx-office-erp -spool:/var/lib/lx-office-erp/spool -templates:/var/lib/lx-office-erp/templates -users:/var/lib/lx-office-erp/users/ -webdav:/var/lib/lx-office-erp/webdav -xslt:/var/lib/lx-office-erp/xslt -' - -for symspec in $SYMLINKS; do - set - `echo $symspec | sed -e 's/:/ /g'` - src=$1 - tar=$2 - - ln -s $tar $SRC/DEBIAN/usr/lib/lx-office-erp/$src -done -#fertig mkdir -p $DEST cd $DEST #Struktur anlegen: -cp -a $SRC/DEBIAN/* . -rm ./mk*.sh +cp -a $SRC/DEBIAN/DEBIAN . +tar xzf $SRC/DEBIAN/struktur.tgz #Dateien kopieren: #aber keine fertigen Konfigurationen, nur *.default @@ -97,6 +40,7 @@ cp -a $SRC/*.pl usr/lib/lx-office-erp cp $SRC/VERSION usr/lib/lx-office-erp cp $SRC/index.html usr/lib/lx-office-erp cp $SRC/config/lx-erp.conf etc/lx-office-erp/lx-erp.conf.default +cp $SRC/config/console.conf.default etc/lx-office-erp/ cp $SRC/config/authentication.pl.default etc/lx-office-erp/ cp $SRC/menu.ini usr/lib/lx-office-erp/menu.default cp -a $SRC/css var/lib/lx-office-erp diff --git a/DEBIAN/struktur.tgz b/DEBIAN/struktur.tgz new file mode 100644 index 0000000000000000000000000000000000000000..a1b01c240ff29fbb6d4dcba0dda4b2c4ccccb41d GIT binary patch literal 2762 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 literal 0 HcmV?d00001 -- 2.20.1