From: Michael Wagner <michael@wagnertech.de>
Date: Sat, 16 Jan 2021 22:42:27 +0000 (+0100)
Subject: epic-ts
X-Git-Tag: kivitendo_3.5.6.1-0~2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=dc2a8f704fb1cf452e11fc1c80c2f5e39ea8f30f;p=kivitendo-erp.git

epic-ts
---

diff --git a/config/kivitendo.conf.default b/config/kivitendo.conf.default
index cf2998495..3023eaa28 100644
--- a/config/kivitendo.conf.default
+++ b/config/kivitendo.conf.default
@@ -38,8 +38,8 @@ failed_login_penalty = 5
 host     = localhost
 port     = 5432
 db       = kivitendo_auth
-user     = postgres
-password =
+user     = kivitendo
+password = admin123
 
 [authentication/ldap]
 # This section is only relevant if 'module' is set to 'LDAP'. It names
diff --git a/debian/kivitendo.conf b/debian/kivitendo.conf
index 4209c8959..740d3c7d1 100755
--- a/debian/kivitendo.conf
+++ b/debian/kivitendo.conf
@@ -1,15 +1,15 @@
 # Configuration for kivitendo
 # Kivitendo-Installattion mit FCGI
-AliasMatch ^/kivitendo/[^/]+\.pl /opt/kivitendo-erp-3.5.4/dispatcher.fcgi
-Alias /kivitendo/ /opt/kivitendo-erp-3.5.4/
+AliasMatch ^/kivitendo/[^/]+\.pl /opt/kivitendo-erp/dispatcher.fcgi
+Alias /kivitendo/ /opt/kivitendo-erp/
 
-<Directory /opt/kivitendo-erp-3.5.4>
+<Directory /opt/kivitendo-erp>
   AllowOverride All
   Options ExecCGI Includes FollowSymlinks
   Require all granted
 </Directory>
 
-<DirectoryMatch /opt/kivitendo-erp-3.5.4/users>
+<DirectoryMatch /opt/kivitendo-erp/users>
   Require all denied
 </DirectoryMatch>
 
diff --git a/debian/kivitendo.control b/debian/kivitendo.control
index caf06a5c2..d7af9f9f1 100644
--- a/debian/kivitendo.control
+++ b/debian/kivitendo.control
@@ -23,6 +23,7 @@ Depends: apache2, postgresql, libapache2-mod-fcgid, libarchive-zip-perl, libclon
   libdatetime-set-perl, libset-infinite-perl, liblist-utilsby-perl,
   libdaemon-generic-perl, libfile-flock-perl, libfile-slurp-perl,
   libfile-mimeinfo-perl, libpbkdf2-tiny-perl, libregexp-ipv6-perl,
-  libdatetime-event-cron-perl, libexception-class-perl
+  libdatetime-event-cron-perl, libexception-class-perl,
+  libcam-pdf-perl
 Description: kivitendo-ERP
 
diff --git a/debian/kivitendo.cp b/debian/kivitendo.cp
index 344991e00..0b0ee37cd 100755
--- a/debian/kivitendo.cp
+++ b/debian/kivitendo.cp
@@ -3,8 +3,8 @@ set -e
 
 # parameter: $1: base dir for copy (optional)
 
-mkdir -p $1/opt/kivitendo-erp-3.5.4
-rsync -av --exclude="debian" --exclude=".git" ./ $1/opt/kivitendo-erp-3.5.4/
+mkdir -p $1/opt/kivitendo-erp
+rsync -av --exclude="debian" --exclude=".git" ./ $1/opt/kivitendo-erp/
 
 mkdir -p $1/etc/apache2/sites-available
 mkdir -p $1/etc/apache2/sites-enabled
diff --git a/debian/kivitendo.postinst b/debian/kivitendo.postinst
index 37fad6b3a..1999d3049 100755
--- a/debian/kivitendo.postinst
+++ b/debian/kivitendo.postinst
@@ -3,22 +3,38 @@ set -e
 
 # kivitendo postinst
 
-version="3.5.4"
-
 # check configuration file
-if [ ! -e /opt/kivitendo-erp-$version/config/kivitendo.conf ]
+if [ ! -e /opt/kivitendo-erp/config/kivitendo.conf ]
 then
-	echo "Type new kivitendo admin password:"
+	echo "Type new kivitendo admin and DB password:"
 	read a
-	sed "s/admin123/$a/" /opt/kivitendo-erp-$version/config/kivitendo.conf.default >/opt/kivitendo-erp-$version/config/kivitendo.conf
+	sed "s/admin123/$a/" /opt/kivitendo-erp/config/kivitendo.conf.default >/opt/kivitendo-erp/config/kivitendo.conf
+fi
+
+# test DB login
+if ! echo "\q" | psql kivitendo_auth kivitendo
+then
+	# create kivitendo user
+	su postgres -c "createuser -dPs kivitendo"
+fi
+if ! grep kivitendo /etc/postgresql/*/main/pg_hba.conf >/dev/null
+then
+	echo "local   all   kivitendo   md5" >> /etc/postgresql/*/main/pg_hba.conf
+	systemctl reload postgresql
 fi
 
 # allow write access to some directories
-chown www-data /opt/kivitendo-erp-$version/users /opt/kivitendo-erp-$version/templates
-chgrp www-data /opt/kivitendo-erp-$version/users /opt/kivitendo-erp-$version/templates
+chown www-data /opt/kivitendo-erp/users /opt/kivitendo-erp/templates
+chgrp www-data /opt/kivitendo-erp/users /opt/kivitendo-erp/templates
 
 systemctl restart apache2
 
 # call installation check
-/opt/kivitendo-erp-$version/scripts/installation_check.pl
+/opt/kivitendo-erp/scripts/installation_check.pl
+
+if [ ! -d /opt/kivitendo-erp/webdav ]
+then
+	mkdir /opt/kivitendo-erp/webdav
+	chown www-data:www-data /opt/kivitendo-erp/webdav
+fi