fix php-fpm-legacy conf. for dolibarr

4 files changed, 24 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca38fc21e5ed..af7fb5d8b86d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dolibarr
 	pkgdesc = Dolibarr ERP CRM: modern software package to manage your company
 	pkgver = 17.0.0
-	pkgrel = 4
+	pkgrel = 5
 	url = https://dolibarr.org/
 	install = dolibarr.install
 	arch = any
@@ -13,9 +13,11 @@ pkgbase = dolibarr
 	options = emptydirs
 	backup = etc/dolibarr/conf.php
 	source = http://downloads.sourceforge.net/project/dolibarr/Dolibarr%20ERP-CRM/17.0.0/dolibarr-17.0.0.tgz
+	source = dolibarr.conf
 	source = nginx.conf.example
 	source = apache.conf.example
 	b2sums = 06be067676cae8a2372f5082e10d9742372ce3fdc494e0b132de9872d70be4dc69ffdd8197930fee30a994774dd8d9f73a3c3666d41a0d6a4a5ae438fc05320b
+	b2sums = e78f127924e37c9d5910ec3081cf0b13d79c58e6350f499261380cffd0ee0023e2488e20e24d0463c01548694c80e45e79b27efc9a81a3458e96c050dce7211d
 	b2sums = 6ab4f2b86e9db40c91a0db181421594b78deccaac8d45c851f8d61a2999bdd14b84ac11018356728d1ec6ec0215094a6658ab5b74960f37a67e1d089c4ed61ac
 	b2sums = 8bb3823afee0515931cfbd4ddc8714ccab29f3d46fa249554670cce9d5ed79b8645515cc758edf3293c40bd9a7917bc1ae8664e3bd6b6a2a1502379b4257f499
 
diff --git a/PKGBUILD b/PKGBUILD
index e81319149e45..895ba795ec9c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: HLFH <gaspard@dhautefeuille.eu>
 pkgname=dolibarr
 pkgver=17.0.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Dolibarr ERP CRM: modern software package to manage your company"
 arch=('any')
 url="https://dolibarr.org/"
@@ -15,9 +15,11 @@ options=('!strip' 'emptydirs')
 backup=("etc/$pkgname/conf.php")
 install=dolibarr.install
 source=("http://downloads.sourceforge.net/project/$pkgname/Dolibarr%20ERP-CRM/$pkgver/$pkgname-$pkgver.tgz"
+        dolibarr.conf
         nginx.conf.example
         apache.conf.example)
 b2sums=('06be067676cae8a2372f5082e10d9742372ce3fdc494e0b132de9872d70be4dc69ffdd8197930fee30a994774dd8d9f73a3c3666d41a0d6a4a5ae438fc05320b'
+        'e78f127924e37c9d5910ec3081cf0b13d79c58e6350f499261380cffd0ee0023e2488e20e24d0463c01548694c80e45e79b27efc9a81a3458e96c050dce7211d'
         '6ab4f2b86e9db40c91a0db181421594b78deccaac8d45c851f8d61a2999bdd14b84ac11018356728d1ec6ec0215094a6658ab5b74960f37a67e1d089c4ed61ac'
         '8bb3823afee0515931cfbd4ddc8714ccab29f3d46fa249554670cce9d5ed79b8645515cc758edf3293c40bd9a7917bc1ae8664e3bd6b6a2a1502379b4257f499')
 
@@ -31,12 +33,13 @@ prepare() {
 
 package() {
 	mkdir -p "$pkgdir/usr/share/$pkgname"
-	mkdir -p "$pkgdir/etc/$pkgname"
+	mkdir -p "$pkgdir/etc/$pkgname/contrib"
 	mkdir -p "$pkgdir/var/lib/$pkgname"
 	mkdir -p "$pkgdir/usr/share/licenses/$pkgname"
 	mkdir -p "$pkgdir/usr/share/doc/$pkgname"
-
-	cp *.conf.example "$pkgdir/etc/$pkgname/"
+        mkdir -p "$pkgdir/etc/systemd/system/php-fpm-legacy.service.d"
+	cp *.conf.example "$pkgdir/etc/$pkgname/contrib/"
+        cp dolibarr.conf "$pkgdir/etc/systemd/system/php-fpm-legacy.service.d/"
 
 	cd "$pkgname-$pkgver"
 	cp -ra htdocs "$pkgdir/usr/share/$pkgname/"
diff --git a/dolibarr.conf b/dolibarr.conf
new file mode 100644
index 000000000000..64f9265c19e0
--- /dev/null
+++ b/dolibarr.conf
@@ -0,0 +1,3 @@
+[Service]
+ReadWritePaths=/usr/share/dolibarr
+ReadWritePaths=/etc/dolibarr
diff --git a/dolibarr.install b/dolibarr.install
index 69f97a8a04d6..91f2e8b7eacd 100644
--- a/dolibarr.install
+++ b/dolibarr.install
@@ -1,9 +1,11 @@
 post_install() {
 	chown -R http:http var/lib/dolibarr
 	chown http:http etc/dolibarr/conf.php
-	echo 'Please configure your webserver. Example files are provided in /etc/dolibarr'
-	echo 'It could be necessary to add /var/lib/dolibarr/ to open_basedir in php.ini'
-	echo 'Finish installation by pointing your webbrowser to http://dolibarr.localdomain/install'
+	systemctl daemon-reload
+	systemctl restart php-fpm-legacy.service
+	echo 'Please configure your webserver. Example configuration files for nginx and apache are provided in /etc/dolibarr/contrib'
+	echo 'We restarted php-fpm-legacy.service for you at it was necessary to give write permission to /usr/share/dolibarr and /etc/dolibarr'
+	echo 'Finish installation by pointing your browser to https://erp.example.com where example.com will be replaced by the domain name you use'
 }
 
 post_upgrade() {
@@ -11,19 +13,19 @@ post_upgrade() {
 	new=`expr $1 : '\([0-9]*\.[0-9]*\.\)'`"0"
 	if [ $old == $new ]
 	then
-		if [ $old == '3.8.0' ]
+		if [ $old == '17.0.0' ]
 		then
-			old='3.7.0'
+			old='16.0.0'
 		fi	
 	fi
-	rm var/lib/dolibarr/install.lock
-	cd usr/share/dolibarr/htdocs/install
+	rm /var/lib/dolibarr/install.lock
+	cd /usr/share/dolibarr/htdocs/install
 	echo 'upgrade.php' $old $new
 	php upgrade.php $old $new > /dev/null
 	echo 'upgrade2.php' $old $new
 	php upgrade2.php $old $new > /dev/null
 	php step5.php $old $new > /dev/null
 	cd /
-	touch var/lib/dolibarr/install.lock
-	chmod 444 var/lib/dolibarr/install.lock
+	touch /var/lib/dolibarr/install.lock
+	chmod 444 /var/lib/dolibarr/install.lock
 }