From 031e73124a23bc4a5fc6d0dab049c9b315325db8 Mon Sep 17 00:00:00 2001
From: Dominique Roux <dominique.roux4@gmail.com>
Date: Tue, 19 Nov 2019 18:04:26 +0100
Subject: [PATCH] bugfixes for the php/fpm configuration

---
 files/fpm.conf | 2 +-
 manifest       | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/files/fpm.conf b/files/fpm.conf
index 776f2c6..322fba7 100644
--- a/files/fpm.conf
+++ b/files/fpm.conf
@@ -3,7 +3,7 @@
 user = www-data
 group = www-data
 
-listen = /run/php/php7.0-fpm.sock
+listen = /run/php/phpVERSION-fpm.sock
 
 listen.owner = www-data
 listen.group = www-data
diff --git a/manifest b/manifest
index 687127b..98a057c 100755
--- a/manifest
+++ b/manifest
@@ -73,13 +73,14 @@ for package in ${packages}
     do require="__apt_update_index" __package $package --state=present
 done
 
-__package postgresql --state=present
-__package curl --state=present
+require="__apt_update_index" __package postgresql --state=present
+require="__apt_update_index" __package curl --state=present
 
 # Configure packages
 ## PHP 7
+sed "s/VERSION/$phpv/" "$__type/files/fpm.conf" > "$tmpdir/fpm"
 require="__package/php${phpv}-fpm" __file /etc/php/${phpv}/fpm/pool.d/www.conf \
-    --owner root --group root --mode 644 --source "$__type/files/fpm.conf"
+    --owner root --group root --mode 644 --source "$tmpdir/fpm"
 
 
 
@@ -97,7 +98,7 @@ require="__ungleich_http_server_ssl_redirect_letsencrypt/$domain" \
 
 ### The SSL configuration
 sed "s/DOMAIN/$domain/" "$__type/files/nextcloud.nginx" > "$tmpdir/nginx"
-sed "s/VERSION/$phpv/" "$__type/files/nextcloud.nginx" > "$tmpdir/nginx"
+sed -i "s/VERSION/$phpv/" "$tmpdir/nginx"
 require="__letsencrypt_cert/$domain __package/nginx" __file /etc/nginx/sites-enabled/nextcloud \
        --owner www-data \
        --group www-data \