From: Michael Wagner <info@wagnertech.de>
Date: Fri, 13 May 2016 09:41:52 +0000 (+0200)
Subject: posaune
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=934f87c0047ef1cab2a56069c5a214c55738f158;p=kivitendo-erp.git

posaune
---

diff --git a/etc/kivitendo.control b/etc/kivitendo.control
index 3f38f91bd..2535a57f5 100644
--- a/etc/kivitendo.control
+++ b/etc/kivitendo.control
@@ -3,7 +3,7 @@ Version: 3.0.0-%BUILD%
 Section: base
 Priority: optional
 Architecture: all
-Depends:
+Depends: apache2, postgresql, libapache2-mod-fcgid
 Maintainer: WagnerTech UG <mail@wagnertech.de>
 Description: kivitendo-ERP
 
diff --git a/etc/kivitendo.cp b/etc/kivitendo.cp
index f0935cf8d..29fde4737 100755
--- a/etc/kivitendo.cp
+++ b/etc/kivitendo.cp
@@ -5,3 +5,4 @@ set -e
 
 mkdir -p $1/opt
 cp -a src/kivitendo-erp $1/opt
+mv $1/opt/kivitendo-erp $1/opt/kivitendo-erp-3.3.0
diff --git a/etc/kivitendo.postinst b/etc/kivitendo.postinst
index 1198bfd09..e21de9593 100755
--- a/etc/kivitendo.postinst
+++ b/etc/kivitendo.postinst
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 # kivitendo postinst
 
@@ -11,18 +12,18 @@ then
                      print "# Configuration for kivitendo"; \
                      print "# Kivitendo-Installattion mit FCGI"; \
                      print "AddHandler fcgid-script .fpl"; \
-                     print "AliasMatch ^/kivitendo/[^/]+\.pl /opt/kivitendo/dispatcher.fpl"; \
-                     print "Alias /kivitendo/ /opt/kivitendo/"; \
+                     print "AliasMatch ^/kivitendo/[^/]+\.pl /opt/kivitendo-erp-3.3.0/dispatcher.fpl"; \
+                     print "Alias /kivitendo/ /opt/kivitendo-erp-3.3.0/"; \
                      print "FcgidMaxRequestLen 10485760"; \
 
-                     print "<Directory /opt/kivitendo>"; \
+                     print "<Directory /opt/kivitendo-erp-3.3.0>"; \
                      print "  AllowOverride All"; \
                      print "  Options ExecCGI Includes FollowSymlinks"; \
                      print "  Order Allow,Deny"; \
                      print "  Allow from All"; \
                      print "</Directory>"; \
 
-                     print "<DirectoryMatch /opt/kivitendo/users>"; \
+                     print "<DirectoryMatch /opt/kivitendo-erp-3.3.0/users>"; \
                      print "  Order Deny,Allow"; \
                      print "  Deny from All"; \
                      print "</DirectoryMatch>"; \
@@ -35,14 +36,14 @@ then
 fi
 
 # check configuration file
-if [ ! -e /opt/kivitendo/config/kivitendo.conf ]
+if [ ! -e /opt/kivitendo-erp-3.3.0/config/kivitendo.conf ]
 then
-	echo "Type admin password:"
+	echo "Type new kivitendo admin password:"
 	read a
-	sed "s/admin123/$a/" /opt/kivitendo/config/kivitendo.conf.default >/opt/kivitendo/config/kivitendo.conf
+	sed "s/admin123/$a/" /opt/kivitendo-erp-3.3.0/config/kivitendo.conf.default >/opt/kivitendo-erp-3.3.0/config/kivitendo.conf
 fi
 
 # allow write access to some directories
-chown www-data /opt/kivitendo/users /opt/kivitendo/templates
-chgrp www-data /opt/kivitendo/users /opt/kivitendo/templates
+chown www-data /opt/kivitendo-erp-3.3.0/users /opt/kivitendo-erp-3.3.0/templates
+chgrp www-data /opt/kivitendo-erp-3.3.0/users /opt/kivitendo-erp-3.3.0/templates