From 0f0fce39441238f137743e920ebe1bfcb1ced360 Mon Sep 17 00:00:00 2001
From: Kay0u <pierre@kayou.io>
Date: Wed, 27 Oct 2021 14:47:23 +0200
Subject: [PATCH 1/3] change group of php-fpm

---
 conf/php-fpm.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index ab1a471..eff4ac0 100644
--- a/conf/php-fpm.conf
+++ b/conf/php-fpm.conf
@@ -21,7 +21,7 @@
 ; Note: The user is mandatory. If the group is not set, the default user's group
 ;       will be used.
 user = __USER__
-group = __USER__
+group = www-data
 
 ; The address on which to accept FastCGI requests.
 ; Valid syntaxes are:

From 59a96fdae0f24a0cb01a29cfc8e1ecb5be1c36d0 Mon Sep 17 00:00:00 2001
From: Kay0u <pierre@kayou.io>
Date: Wed, 27 Oct 2021 14:50:40 +0200
Subject: [PATCH 2/3] bump package version

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 9ab505f..55aae2e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Blog publishing application",
         "fr": "Moteur de blog"
     },
-    "version": "2.19~ynh2",
+    "version": "2.19~ynh3",
     "license": "GPL-2.0-or-later",
     "url": "https://dotclear.org/",
     "maintainer": {

From 3ed25c02ee15e1a644746149bdfbf453ad35b481 Mon Sep 17 00:00:00 2001
From: Kay0u <pierre@kayou.io>
Date: Fri, 29 Oct 2021 15:29:25 +0200
Subject: [PATCH 3/3] add acl for www-data instead

---
 conf/php-fpm.conf | 2 +-
 scripts/install   | 4 ++++
 scripts/restore   | 4 ++++
 scripts/upgrade   | 4 ++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index eff4ac0..ab1a471 100644
--- a/conf/php-fpm.conf
+++ b/conf/php-fpm.conf
@@ -21,7 +21,7 @@
 ; Note: The user is mandatory. If the group is not set, the default user's group
 ;       will be used.
 user = __USER__
-group = www-data
+group = __USER__
 
 ; The address on which to accept FastCGI requests.
 ; Valid syntaxes are:
diff --git a/scripts/install b/scripts/install
index 6b38ff1..e0c5949 100755
--- a/scripts/install
+++ b/scripts/install
@@ -87,6 +87,10 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
+# https://dotclear.org/documentation/2.0/admin/install
+mkdir -p "$final_path/"{cache,public}
+setfacl -m d:u:www-data:rwx "$final_path/"{cache,public}
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index fac5f29..aa9e6a2 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -69,6 +69,10 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
+# https://dotclear.org/documentation/2.0/admin/install
+mkdir -p "$final_path/"{cache,public}
+setfacl -m d:u:www-data:rwx "$final_path/"{cache,public}
+
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index fc37c0f..689feaa 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -118,6 +118,10 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
+# https://dotclear.org/documentation/2.0/admin/install
+mkdir -p "$final_path/"{cache,public}
+setfacl -m d:u:www-data:rwx "$final_path/"{cache,public}
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================