From 6d199c674a5823b1ffeb5ae34610f6d377469688 Mon Sep 17 00:00:00 2001
From: Robles Rodolphe <rodolphe.robles@sfr.fr>
Date: Fri, 15 Dec 2023 10:00:40 +0100
Subject: [PATCH 01/80] Update upgrade

keep config file
---
 scripts/upgrade | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index cad61ab..be214d2 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -74,13 +74,13 @@ chmod 644 "/etc/cron.d/$app"
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================
-ynh_script_progression --message="Updating a configuration file..." --weight=5
+#ynh_script_progression --message="Updating a configuration file..." --weight=5
 
 # Install configuration files
-ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
+#ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
 
-chmod 650 "$install_dir/config.local.php"
-chown $app:$app "$install_dir/config.local.php"
+#chmod 650 "$install_dir/config.local.php"
+#chown $app:$app "$install_dir/config.local.php"
 
 #=================================================
 # END OF SCRIPT

From 23f6bc597af7236e0683a2e1e91162e5e99e0b8c Mon Sep 17 00:00:00 2001
From: Robles Rodolphe <rodolphe.robles@sfr.fr>
Date: Fri, 15 Dec 2023 10:02:58 +0100
Subject: [PATCH 02/80] Update upgrade

keep like stable
---
 scripts/upgrade | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index be214d2..cad61ab 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -74,13 +74,13 @@ chmod 644 "/etc/cron.d/$app"
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================
-#ynh_script_progression --message="Updating a configuration file..." --weight=5
+ynh_script_progression --message="Updating a configuration file..." --weight=5
 
 # Install configuration files
-#ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
+ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
 
-#chmod 650 "$install_dir/config.local.php"
-#chown $app:$app "$install_dir/config.local.php"
+chmod 650 "$install_dir/config.local.php"
+chown $app:$app "$install_dir/config.local.php"
 
 #=================================================
 # END OF SCRIPT

From 4868e0b87fa7a46ac24fa295fa7d9ee1920a5e3d Mon Sep 17 00:00:00 2001
From: Robles Rodolphe <rodolphe.robles@sfr.fr>
Date: Fri, 15 Dec 2023 10:32:56 +0100
Subject: [PATCH 03/80] Update config.local.php

add a link to file config.local.user.php
---
 conf/config.local.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/conf/config.local.php b/conf/config.local.php
index c8efcb2..a5d3fba 100644
--- a/conf/config.local.php
+++ b/conf/config.local.php
@@ -6,7 +6,7 @@
  *
  * NE PAS MODIFIER CE FICHIER!
  *
- * Pour configurer Paheko, copiez ce fichier en 'config.local.php'
+ * Pour ajouter des configurations personneles à Paheko, ajoutez-les dans __DATA__DIR__/data/config.local.user.php'
  * puis décommentez et modifiez ce dont vous avez besoin.
  */
 
@@ -884,3 +884,5 @@ const MAIL_SENDER = '__APP__@__DOMAIN__';
  * @var null|string
  */
 //const ALERT_MESSAGE = 'Ceci est un compte de test.';
+
+require '__DATA__DIR__/data/config.local.user.php';

From aeef0051c699e7597941697c4a61ab7d6f22eb6a Mon Sep 17 00:00:00 2001
From: Robles Rodolphe <rodolphe.robles@sfr.fr>
Date: Fri, 15 Dec 2023 10:35:22 +0100
Subject: [PATCH 04/80] Create config.local.user.php

---
 conf/config.local.user.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 conf/config.local.user.php

diff --git a/conf/config.local.user.php b/conf/config.local.user.php
new file mode 100644
index 0000000..dbcdf62
--- /dev/null
+++ b/conf/config.local.user.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * Ce fichier représente un exemple des constantes de configuration
+ * disponibles pour Paheko.
+ *
+ * Modifiez ce fichier à votre guise, il ne sera pas modifié lors des mises à jour.
+ * Consultez le fichier config.dist.php pour disposer d'un exemple.
+ *
+ */
+
+// Nécessaire pour situer les constantes dans le bon namespace
+namespace Paheko;

From 95cb5edf913f8c338c29c9a6d0703f94d39dc9ef Mon Sep 17 00:00:00 2001
From: Robles Rodolphe <rodolphe.robles@sfr.fr>
Date: Fri, 15 Dec 2023 10:48:46 +0100
Subject: [PATCH 05/80] Update install

add config.local.user.php
---
 scripts/install | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 34521fc..045c2ae 100644
--- a/scripts/install
+++ b/scripts/install
@@ -18,7 +18,7 @@ ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key
 ynh_script_progression --message="Setting up source files..." --weight=4
 
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$install_dir"
+ynh_setup_source --dest_dir="$data_dir"data/
 
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
@@ -47,9 +47,12 @@ ynh_script_progression --message="Adding a configuration file..." --weight=5
 
 # Install configuration files
 ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
+ynh_add_config --template="config.local.user.php" --destination="$install_dir/data/config.local.user.php"
 
 chmod 650 "$install_dir/config.local.php"
 chown $app:$app "$install_dir/config.local.php"
+chmod 650 "$data_dir/data/config.local.user.php"
+chown $app:$app "$data_dir/data/config.local.user.php"
 
 #=================================================
 # END OF SCRIPT

From 35047bd732377b4782b2767eab707305bc12e470 Mon Sep 17 00:00:00 2001
From: Robles Rodolphe <rodolphe.robles@sfr.fr>
Date: Fri, 15 Dec 2023 10:55:25 +0100
Subject: [PATCH 06/80] Update upgrade

keep config.local.user.php
---
 scripts/upgrade | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index cad61ab..25fb4c1 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -38,10 +38,9 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=5
 
 	if [ ! -d "$data_dir/data" ]; then
-    	ynh_print_warn "Migrating data directory to $data_dir..."
+    		ynh_print_warn "Migrating data directory to $data_dir..."
 
-    	# remove old configuration files
-		ynh_secure_remove --file="$install_dir/data/config.local.user.php"
+    		# remove old configuration files
 		ynh_secure_remove --file="$install_dir/config.local.yunohost.php"
 		
 		mv "$install_dir/data" "$data_dir"

From 1fe9b92fd5eabf3115d9dfe85bcb3931e344dc1f Mon Sep 17 00:00:00 2001
From: Robles Rodolphe <rodolphe.robles@sfr.fr>
Date: Fri, 15 Dec 2023 20:29:00 +0100
Subject: [PATCH 07/80] Update config.local.user.php

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

diff --git a/conf/config.local.user.php b/conf/config.local.user.php
index dbcdf62..f6858b5 100644
--- a/conf/config.local.user.php
+++ b/conf/config.local.user.php
@@ -5,7 +5,7 @@
  * disponibles pour Paheko.
  *
  * Modifiez ce fichier à votre guise, il ne sera pas modifié lors des mises à jour.
- * Consultez le fichier config.dist.php pour disposer d'un exemple.
+ * Consultez le fichier config.local.php pour disposer d'un exemple.
  *
  */
 

From 22785a0458cb59747c2228a48778aa59527b9cbe Mon Sep 17 00:00:00 2001
From: Robles Rodolphe <rodolphe.robles@sfr.fr>
Date: Sun, 17 Dec 2023 21:47:49 +0100
Subject: [PATCH 08/80] Update upgrade

try keep just the config.local.php
---
 scripts/upgrade | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 25fb4c1..48a52bb 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -37,15 +37,6 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Upgrading source files..." --weight=5
 
-	if [ ! -d "$data_dir/data" ]; then
-    		ynh_print_warn "Migrating data directory to $data_dir..."
-
-    		# remove old configuration files
-		ynh_secure_remove --file="$install_dir/config.local.yunohost.php"
-		
-		mv "$install_dir/data" "$data_dir"
-	fi
-
 	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$install_dir" --keep="config.local.php data/plugins"
 fi

From b9b8b570b13243f33de22fa23dc492bdd89778ce Mon Sep 17 00:00:00 2001
From: Robles Rodolphe <rodolphe.robles@sfr.fr>
Date: Sun, 17 Dec 2023 21:52:28 +0100
Subject: [PATCH 09/80] Update upgrade

do I need put again the config.local.php if I --keep it ?
---
 scripts/upgrade | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 48a52bb..e975052 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -64,13 +64,13 @@ chmod 644 "/etc/cron.d/$app"
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================
-ynh_script_progression --message="Updating a configuration file..." --weight=5
+#ynh_script_progression --message="Updating a configuration file..." --weight=5
 
 # Install configuration files
-ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
+#ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
 
-chmod 650 "$install_dir/config.local.php"
-chown $app:$app "$install_dir/config.local.php"
+#chmod 650 "$install_dir/config.local.php"
+#chown $app:$app "$install_dir/config.local.php"
 
 #=================================================
 # END OF SCRIPT

From 2090b7532f33382a67cf0eb724e108880ae131c5 Mon Sep 17 00:00:00 2001
From: Robles Rodolphe <rodolphe.robles@sfr.fr>
Date: Sun, 17 Dec 2023 21:54:12 +0100
Subject: [PATCH 10/80] Update install

try just keep the config.local.php
---
 scripts/install | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index 045c2ae..fb22afe 100644
--- a/scripts/install
+++ b/scripts/install
@@ -47,12 +47,12 @@ ynh_script_progression --message="Adding a configuration file..." --weight=5
 
 # Install configuration files
 ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
-ynh_add_config --template="config.local.user.php" --destination="$install_dir/data/config.local.user.php"
+#ynh_add_config --template="config.local.user.php" --destination="$install_dir/data/config.local.user.php"
 
 chmod 650 "$install_dir/config.local.php"
 chown $app:$app "$install_dir/config.local.php"
-chmod 650 "$data_dir/data/config.local.user.php"
-chown $app:$app "$data_dir/data/config.local.user.php"
+#chmod 650 "$data_dir/data/config.local.user.php"
+#chown $app:$app "$data_dir/data/config.local.user.php"
 
 #=================================================
 # END OF SCRIPT

From 53025757a3e5e64d946a5f519003f6df67839295 Mon Sep 17 00:00:00 2001
From: Robles Rodolphe <rodolphe.robles@sfr.fr>
Date: Sun, 17 Dec 2023 22:07:15 +0100
Subject: [PATCH 11/80] Delete conf/config.local.user.php

try keep only config.local.php
---
 conf/config.local.user.php | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 conf/config.local.user.php

diff --git a/conf/config.local.user.php b/conf/config.local.user.php
deleted file mode 100644
index f6858b5..0000000
--- a/conf/config.local.user.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * Ce fichier représente un exemple des constantes de configuration
- * disponibles pour Paheko.
- *
- * Modifiez ce fichier à votre guise, il ne sera pas modifié lors des mises à jour.
- * Consultez le fichier config.local.php pour disposer d'un exemple.
- *
- */
-
-// Nécessaire pour situer les constantes dans le bon namespace
-namespace Paheko;

From 9ec03f518ee2ed9139aaa6c9803140e57e74b1e0 Mon Sep 17 00:00:00 2001
From: Robles Rodolphe <rodolphe.robles@sfr.fr>
Date: Sun, 17 Dec 2023 22:13:56 +0100
Subject: [PATCH 12/80] Update config.local.php

customize the message for this file
---
 conf/config.local.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/config.local.php b/conf/config.local.php
index a5d3fba..eacdb59 100644
--- a/conf/config.local.php
+++ b/conf/config.local.php
@@ -2,11 +2,11 @@
 
 /**
  * Ce fichier représente un exemple des constantes de configuration
- * disponibles pour Paheko.
+ * disponibles pour Paheko. Il est bâti depuis une copie du fichier __INSTALL_DIR__/config.dist.php
  *
- * NE PAS MODIFIER CE FICHIER!
+ * NE PAS MODIFIER LES VALEURS PRÉSENTES DÉCOMMENTÉES DANS CE FICHIER!
  *
- * Pour ajouter des configurations personneles à Paheko, ajoutez-les dans __DATA__DIR__/data/config.local.user.php'
+ * Pour ajouter des configurations personneles à Paheko, lisez-les battentivement dans ce fichier,
  * puis décommentez et modifiez ce dont vous avez besoin.
  */
 

From fe7101b5b1be1a67c772e11a52675588bd7f15f9 Mon Sep 17 00:00:00 2001
From: Robles Rodolphe <rodolphe.robles@sfr.fr>
Date: Sun, 17 Dec 2023 22:15:19 +0100
Subject: [PATCH 13/80] Update install

keep only a config.local.php file
---
 scripts/install | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index fb22afe..2fe98c1 100644
--- a/scripts/install
+++ b/scripts/install
@@ -47,12 +47,9 @@ ynh_script_progression --message="Adding a configuration file..." --weight=5
 
 # Install configuration files
 ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
-#ynh_add_config --template="config.local.user.php" --destination="$install_dir/data/config.local.user.php"
 
 chmod 650 "$install_dir/config.local.php"
 chown $app:$app "$install_dir/config.local.php"
-#chmod 650 "$data_dir/data/config.local.user.php"
-#chown $app:$app "$data_dir/data/config.local.user.php"
 
 #=================================================
 # END OF SCRIPT

From 7c82c74c25c36c0ee1edeb2f6c723f7c7689b89e Mon Sep 17 00:00:00 2001
From: Robles Rodolphe <rodolphe.robles@sfr.fr>
Date: Sun, 17 Dec 2023 22:17:51 +0100
Subject: [PATCH 14/80] Update upgrade

remove the reinstall of the file config.local.php present
---
 scripts/upgrade | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index e975052..fc5d71b 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -62,15 +62,7 @@ chmod 644 "/etc/cron.d/$app"
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================
-# UPDATE A CONFIG FILE
-#=================================================
-#ynh_script_progression --message="Updating a configuration file..." --weight=5
 
-# Install configuration files
-#ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
-
-#chmod 650 "$install_dir/config.local.php"
-#chown $app:$app "$install_dir/config.local.php"
 
 #=================================================
 # END OF SCRIPT

From 94eaf9bb007fddfa20f4ca126adf53eae213db0e Mon Sep 17 00:00:00 2001
From: Robles Rodolphe <rodolphe.robles@sfr.fr>
Date: Sun, 17 Dec 2023 23:14:46 +0100
Subject: [PATCH 15/80] Update upgrade

add exception if version older than 1.3.1~ynh1
---
 scripts/upgrade | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index fc5d71b..be6013b 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -63,6 +63,14 @@ chmod 644 "/etc/cron.d/$app"
 # SPECIFIC UPGRADE
 #=================================================
 
+if ynh_compare_current_package_version --comparison lt --version 1.3.1~ynh1
+then
+  ynh_script_progression --message="Updating a configuration file..." --weight=5
+  
+  ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
+  chmod 650 "$install_dir/config.local.php"
+  chown $app:$app "$install_dir/config.local.php"
+fi
 
 #=================================================
 # END OF SCRIPT

From 31116a81ccc5da219b7140edaa6eb642c3fdfa96 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 00:43:24 +0100
Subject: [PATCH 16/80] add a configuration file on

---
 conf/config.local.php      |  9 +++++++--
 conf/config.local.user.php | 11 +++++++++++
 scripts/install            |  5 +++++
 scripts/upgrade            | 11 ++++++++++-
 4 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 conf/config.local.user.php

diff --git a/conf/config.local.php b/conf/config.local.php
index eacdb59..3189e70 100644
--- a/conf/config.local.php
+++ b/conf/config.local.php
@@ -6,8 +6,9 @@
  *
  * NE PAS MODIFIER LES VALEURS PRÉSENTES DÉCOMMENTÉES DANS CE FICHIER!
  *
- * Pour ajouter des configurations personneles à Paheko, lisez-les battentivement dans ce fichier,
- * puis décommentez et modifiez ce dont vous avez besoin.
+ * Pour ajouter des configurations personnelles à votre instance et les garder,
+ * lisez attentivement ce fichier, puis ajoutez les constantes commentées nécessaires
+ * dans le fichier __DATA_DIR__/data/config.local.user.php.
  */
 
 // Nécessaire pour situer les constantes dans le bon namespace
@@ -885,4 +886,8 @@ const MAIL_SENDER = '__APP__@__DOMAIN__';
  */
 //const ALERT_MESSAGE = 'Ceci est un compte de test.';
 
+/**
+ * Chemin vers le fichier pour des configurations personnelles
+ * qui ne sera pas écraser lors des mises à jour.
+ */
 require '__DATA__DIR__/data/config.local.user.php';
diff --git a/conf/config.local.user.php b/conf/config.local.user.php
new file mode 100644
index 0000000..c2e8bc0
--- /dev/null
+++ b/conf/config.local.user.php
@@ -0,0 +1,11 @@
+/**
+ * Ce fichier est ici pour ajouter des personnalisations à votre configuration.
+ *
+ * Modifiez ce fichier à votre guise, excepté les constantes déjà présentes dans le fichier
+ * __INSTALL__DIR__/config.local.php, il ne sera pas modifié lors des prochaines mises à jour.
+ * Consultez le fichier __INSTALL_DIR__/config.local.php pour disposer des constantes commentées
+ * que vous voudriez éventuellemnt ajouter.
+ */
+
+// Nécessaire pour situer les constantes dans le bon namespace
+namespace Paheko;
\ No newline at end of file
diff --git a/scripts/install b/scripts/install
index 2fe98c1..0718b13 100644
--- a/scripts/install
+++ b/scripts/install
@@ -51,6 +51,11 @@ ynh_add_config --template="config.local.php" --destination="$install_dir/config.
 chmod 650 "$install_dir/config.local.php"
 chown $app:$app "$install_dir/config.local.php"
 
+ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
+
+chmod 650 "$data_dir/data/config.local.user.php"
+chown $app:$app "$data_dir/data/config.local.user.php"
+
 #=================================================
 # END OF SCRIPT
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index be6013b..f0bfb35 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -66,12 +66,21 @@ chmod 644 "/etc/cron.d/$app"
 if ynh_compare_current_package_version --comparison lt --version 1.3.1~ynh1
 then
   ynh_script_progression --message="Updating a configuration file..." --weight=5
-  
+
   ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
   chmod 650 "$install_dir/config.local.php"
   chown $app:$app "$install_dir/config.local.php"
 fi
 
+if [ ! -f "${data_dir}/data/config.local.user.php" ]; then
+	ynh_script_progression --message="Updating a configuration file..." --weight=5
+
+  ynh_add_config --template="config.local.user.php" --destination="$data_dir/config.local.php"
+  chmod 650 "$data_dir/config.local.php"
+  chown $app:$app "$data_dir/config.local.php"
+
+fi
+
 #=================================================
 # END OF SCRIPT
 #=================================================

From 9485c533eee500b72da354375fb2b5e494bdf4f0 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 00:55:20 +0100
Subject: [PATCH 17/80] add a configuration file on

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index f0bfb35..2891db8 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -72,7 +72,7 @@ then
   chown $app:$app "$install_dir/config.local.php"
 fi
 
-if [ ! -f "${data_dir}/data/config.local.user.php" ]; then
+if [ ! -f "$data_dir/data/config.local.user.php" ]; then
 	ynh_script_progression --message="Updating a configuration file..." --weight=5
 
   ynh_add_config --template="config.local.user.php" --destination="$data_dir/config.local.php"

From b360de7a96b80ef8b57a093ce7e39fba1bd0048b Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 01:03:17 +0100
Subject: [PATCH 18/80] comment condition for older versions

---
 scripts/upgrade | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 2891db8..e545562 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -63,18 +63,14 @@ chmod 644 "/etc/cron.d/$app"
 # SPECIFIC UPGRADE
 #=================================================
 
-if ynh_compare_current_package_version --comparison lt --version 1.3.1~ynh1
-then
-  ynh_script_progression --message="Updating a configuration file..." --weight=5
-
-  ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
-  chmod 650 "$install_dir/config.local.php"
-  chown $app:$app "$install_dir/config.local.php"
-fi
+# if ynh_compare_current_package_version --comparison lt --version 1.3.1~ynh1
+# then
+#   ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
+#   chmod 650 "$install_dir/config.local.php"
+#   chown $app:$app "$install_dir/config.local.php"
+# fi
 
 if [ ! -f "$data_dir/data/config.local.user.php" ]; then
-	ynh_script_progression --message="Updating a configuration file..." --weight=5
-
   ynh_add_config --template="config.local.user.php" --destination="$data_dir/config.local.php"
   chmod 650 "$data_dir/config.local.php"
   chown $app:$app "$data_dir/config.local.php"

From 974f1033cd0b3f3c3d81b766861bd2a52bf4ea92 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 01:20:34 +0100
Subject: [PATCH 19/80] add a configuration file on

---
 conf/config.local.php      |  4 ++--
 conf/config.local.user.php |  4 ++--
 scripts/upgrade            | 20 ++++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/conf/config.local.php b/conf/config.local.php
index 3189e70..1d513c6 100644
--- a/conf/config.local.php
+++ b/conf/config.local.php
@@ -2,13 +2,13 @@
 
 /**
  * Ce fichier représente un exemple des constantes de configuration
- * disponibles pour Paheko. Il est bâti depuis une copie du fichier __INSTALL_DIR__/config.dist.php
+ * disponibles pour Paheko. Il est bâti depuis une copie du fichier '$install_dir/config.dist.php'
  *
  * NE PAS MODIFIER LES VALEURS PRÉSENTES DÉCOMMENTÉES DANS CE FICHIER!
  *
  * Pour ajouter des configurations personnelles à votre instance et les garder,
  * lisez attentivement ce fichier, puis ajoutez les constantes commentées nécessaires
- * dans le fichier __DATA_DIR__/data/config.local.user.php.
+ * dans le fichier '$data_dir/data/config.local.user.php'.
  */
 
 // Nécessaire pour situer les constantes dans le bon namespace
diff --git a/conf/config.local.user.php b/conf/config.local.user.php
index c2e8bc0..9eff67f 100644
--- a/conf/config.local.user.php
+++ b/conf/config.local.user.php
@@ -2,8 +2,8 @@
  * Ce fichier est ici pour ajouter des personnalisations à votre configuration.
  *
  * Modifiez ce fichier à votre guise, excepté les constantes déjà présentes dans le fichier
- * __INSTALL__DIR__/config.local.php, il ne sera pas modifié lors des prochaines mises à jour.
- * Consultez le fichier __INSTALL_DIR__/config.local.php pour disposer des constantes commentées
+ * '$install_dir/config.local.php', il ne sera pas modifié lors des prochaines mises à jour.
+ * Consultez le fichier '$install_dir/config.local.php' pour disposer des constantes commentées
  * que vous voudriez éventuellemnt ajouter.
  */
 
diff --git a/scripts/upgrade b/scripts/upgrade
index e545562..da34cbe 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -63,18 +63,18 @@ chmod 644 "/etc/cron.d/$app"
 # SPECIFIC UPGRADE
 #=================================================
 
-# if ynh_compare_current_package_version --comparison lt --version 1.3.1~ynh1
-# then
-#   ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
-#   chmod 650 "$install_dir/config.local.php"
-#   chown $app:$app "$install_dir/config.local.php"
-# fi
+if ynh_compare_current_package_version --comparison lt --version 1.3.1~ynh1
+then
+  ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
+  chmod 650 "$install_dir/config.local.php"
+  chown $app:$app "$install_dir/config.local.php"
+fi
 
 if [ ! -f "$data_dir/data/config.local.user.php" ]; then
-  ynh_add_config --template="config.local.user.php" --destination="$data_dir/config.local.php"
-  chmod 650 "$data_dir/config.local.php"
-  chown $app:$app "$data_dir/config.local.php"
-
+	ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
+  ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
+  chmod 650 "$data_dir/data/config.local.user.php"
+  chown $app:$app "$data_dir/config.local.user.php"
 fi
 
 #=================================================

From 0f764f5672c57b130eaaf9a81102be4b61947457 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 01:27:43 +0100
Subject: [PATCH 20/80] add a configuration file on

---
 scripts/upgrade | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index da34cbe..84be02f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -41,6 +41,12 @@ then
 	ynh_setup_source --dest_dir="$install_dir" --keep="config.local.php data/plugins"
 fi
 
+if [ ! -f "$data_dir/data/config.local.user.php" ]; then
+  ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
+  chmod 650 "$data_dir/data/config.local.user.php"
+  chown $app:$app "$data_dir/data/config.local.user.php"
+fi
+
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
@@ -70,12 +76,6 @@ then
   chown $app:$app "$install_dir/config.local.php"
 fi
 
-if [ ! -f "$data_dir/data/config.local.user.php" ]; then
-	ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
-  ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
-  chmod 650 "$data_dir/data/config.local.user.php"
-  chown $app:$app "$data_dir/config.local.user.php"
-fi
 
 #=================================================
 # END OF SCRIPT

From 35a6b0759f0cfbf1cfd3d8edf0eb6c7eb9f2efcf Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 01:38:32 +0100
Subject: [PATCH 21/80] add a configuration file on  need also reinstall the
 config.local.php file

---
 scripts/upgrade | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index 84be02f..68e5659 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -42,9 +42,13 @@ then
 fi
 
 if [ ! -f "$data_dir/data/config.local.user.php" ]; then
+	ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
+  chmod 650 "$install_dir/config.local.php"
+  chown $app:$app "$install_dir/config.local.php"
   ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
   chmod 650 "$data_dir/data/config.local.user.php"
   chown $app:$app "$data_dir/data/config.local.user.php"
+
 fi
 
 chmod -R o-rwx "$install_dir"

From 86f81e26780e54438a7974b6d2b60df58f3e4a79 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 01:52:36 +0100
Subject: [PATCH 22/80] add a line require on config.local.php configuration
 file to read /data/config.local.user.php

---
 scripts/upgrade | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 68e5659..633f931 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -42,9 +42,12 @@ then
 fi
 
 if [ ! -f "$data_dir/data/config.local.user.php" ]; then
-	ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
-  chmod 650 "$install_dir/config.local.php"
-  chown $app:$app "$install_dir/config.local.php"
+  echo'
+	/**
+	 * Chemin vers le fichier pour des configurations personnelles
+	 * qui ne sera pas écraser lors des mises à jour.
+	 */
+	require '$data_dir/data/config.local.user.php';' >> $install_dir/config.local.php
   ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
   chmod 650 "$data_dir/data/config.local.user.php"
   chown $app:$app "$data_dir/data/config.local.user.php"

From e58bd2140bee9660855d265f1e07b6713e44a079 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 01:55:11 +0100
Subject: [PATCH 23/80] add a line require on config.local.php configuration
 file to read /data/config.local.user.php

---
 scripts/upgrade | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 633f931..357b638 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -51,7 +51,6 @@ if [ ! -f "$data_dir/data/config.local.user.php" ]; then
   ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
   chmod 650 "$data_dir/data/config.local.user.php"
   chown $app:$app "$data_dir/data/config.local.user.php"
-
 fi
 
 chmod -R o-rwx "$install_dir"

From 5ac9efe0120e7ec3212e99d9125ea4cf21b7e969 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 01:58:25 +0100
Subject: [PATCH 24/80] add a line require on config.local.php configuration
 file to read /data/config.local.user.php

---
 scripts/upgrade | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 357b638..b059880 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -42,15 +42,15 @@ then
 fi
 
 if [ ! -f "$data_dir/data/config.local.user.php" ]; then
+  ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
+  chmod 650 "$data_dir/data/config.local.user.php"
+  chown $app:$app "$data_dir/data/config.local.user.php"
   echo'
 	/**
 	 * Chemin vers le fichier pour des configurations personnelles
 	 * qui ne sera pas écraser lors des mises à jour.
 	 */
 	require '$data_dir/data/config.local.user.php';' >> $install_dir/config.local.php
-  ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
-  chmod 650 "$data_dir/data/config.local.user.php"
-  chown $app:$app "$data_dir/data/config.local.user.php"
 fi
 
 chmod -R o-rwx "$install_dir"

From cb8f6db2523c1607250c75bf007150112dc4eced Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 02:10:37 +0100
Subject: [PATCH 25/80] add a line require on config.local.php configuration
 file to read /data/config.local.user.php

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index b059880..3d0726b 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -44,7 +44,7 @@ fi
 if [ ! -f "$data_dir/data/config.local.user.php" ]; then
   ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
   chmod 650 "$data_dir/data/config.local.user.php"
-  chown $app:$app "$data_dir/data/config.local.user.php"
+  chown $app:www-data "$data_dir/data/config.local.user.php"
   echo'
 	/**
 	 * Chemin vers le fichier pour des configurations personnelles

From c942fa31350f0c4e610ead805794b2d9c9785f61 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 02:29:09 +0100
Subject: [PATCH 26/80] try add file and line to read
 /data/config.local.user.php

---
 scripts/upgrade | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 3d0726b..bc52292 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -41,6 +41,10 @@ then
 	ynh_setup_source --dest_dir="$install_dir" --keep="config.local.php data/plugins"
 fi
 
+
+chmod -R o-rwx "$install_dir"
+chown -R $app:www-data "$install_dir"
+
 if [ ! -f "$data_dir/data/config.local.user.php" ]; then
   ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
   chmod 650 "$data_dir/data/config.local.user.php"
@@ -53,9 +57,6 @@ if [ ! -f "$data_dir/data/config.local.user.php" ]; then
 	require '$data_dir/data/config.local.user.php';' >> $install_dir/config.local.php
 fi
 
-chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
-
 #=================================================
 # REAPPLY SYSTEM CONFIGURATIONS
 #=================================================

From d9d033e57400625ba0457e81bbb084bb54c52fe7 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 03:06:10 +0100
Subject: [PATCH 27/80] try add file and line to read
 /data/config.local.user.php

---
 scripts/upgrade | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index bc52292..76519cd 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -41,22 +41,21 @@ then
 	ynh_setup_source --dest_dir="$install_dir" --keep="config.local.php data/plugins"
 fi
 
-
-chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
-
 if [ ! -f "$data_dir/data/config.local.user.php" ]; then
   ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
   chmod 650 "$data_dir/data/config.local.user.php"
-  chown $app:www-data "$data_dir/data/config.local.user.php"
+  chown $app:$app "$data_dir/data/config.local.user.php"
   echo'
 	/**
 	 * Chemin vers le fichier pour des configurations personnelles
 	 * qui ne sera pas écraser lors des mises à jour.
 	 */
-	require '$data_dir/data/config.local.user.php';' >> $install_dir/config.local.php
+	require "$data_dir/data/config.local.user.php";' >> $install_dir/config.local.php
 fi
 
+chmod -R o-rwx "$install_dir"
+chown -R $app:www-data "$install_dir"
+
 #=================================================
 # REAPPLY SYSTEM CONFIGURATIONS
 #=================================================

From 433b3d2bfd14f9d317bf991551c6eb970e9e763c Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 03:21:48 +0100
Subject: [PATCH 28/80] try add file and line to read
 /data/config.local.user.php

---
 scripts/upgrade | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 76519cd..f0e1c10 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -29,6 +29,27 @@ if [ -z "${secret_key:-}" ]; then
 	ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key
 fi
 
+#=================================================
+# ADD SPECIFIC FILE IF NEEDED
+#=================================================
+
+# first add config file if not present
+if [ ! -f "$data_dir/data/config.local.user.php" ]; then
+
+	ynh_script_progression --message="Adding a configuration file..." --weight=5
+
+	ynh_script_progression --message=" files..." --weight=5
+  ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
+  chmod 650 "$data_dir/data/config.local.user.php"
+  chown $app:$app "$data_dir/data/config.local.user.php"
+  echo'
+	/**
+	 * Chemin vers le fichier pour des configurations personnelles
+	 * qui ne sera pas écraser lors des mises à jour.
+	 */
+	require '$data_dir/data/config.local.user.php';' >> $install_dir/config.local.php
+fi
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -41,17 +62,6 @@ then
 	ynh_setup_source --dest_dir="$install_dir" --keep="config.local.php data/plugins"
 fi
 
-if [ ! -f "$data_dir/data/config.local.user.php" ]; then
-  ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
-  chmod 650 "$data_dir/data/config.local.user.php"
-  chown $app:$app "$data_dir/data/config.local.user.php"
-  echo'
-	/**
-	 * Chemin vers le fichier pour des configurations personnelles
-	 * qui ne sera pas écraser lors des mises à jour.
-	 */
-	require "$data_dir/data/config.local.user.php";' >> $install_dir/config.local.php
-fi
 
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
@@ -75,12 +85,6 @@ chmod 644 "/etc/cron.d/$app"
 # SPECIFIC UPGRADE
 #=================================================
 
-if ynh_compare_current_package_version --comparison lt --version 1.3.1~ynh1
-then
-  ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
-  chmod 650 "$install_dir/config.local.php"
-  chown $app:$app "$install_dir/config.local.php"
-fi
 
 
 #=================================================

From 1b9517fce3b38061e679b1af60c0f6f2c5a2b62b Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 03:39:36 +0100
Subject: [PATCH 29/80] try add file and line to read
 /data/config.local.user.php

---
 scripts/install | 9 +++++----
 scripts/upgrade | 5 ++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/install b/scripts/install
index 0718b13..31188a1 100644
--- a/scripts/install
+++ b/scripts/install
@@ -46,15 +46,16 @@ chmod 644 "/etc/cron.d/$app"
 ynh_script_progression --message="Adding a configuration file..." --weight=5
 
 # Install configuration files
+ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
+
+chmod 650 "$data_dir/data/config.local.user.php"
+chown $app:$app "$data_dir/data/config.local.user.php"
+
 ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
 
 chmod 650 "$install_dir/config.local.php"
 chown $app:$app "$install_dir/config.local.php"
 
-ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
-
-chmod 650 "$data_dir/data/config.local.user.php"
-chown $app:$app "$data_dir/data/config.local.user.php"
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/upgrade b/scripts/upgrade
index f0e1c10..88c3c6e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -42,12 +42,12 @@ if [ ! -f "$data_dir/data/config.local.user.php" ]; then
   ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
   chmod 650 "$data_dir/data/config.local.user.php"
   chown $app:$app "$data_dir/data/config.local.user.php"
-  echo'
+    echo'
 	/**
 	 * Chemin vers le fichier pour des configurations personnelles
 	 * qui ne sera pas écraser lors des mises à jour.
 	 */
-	require '$data_dir/data/config.local.user.php';' >> $install_dir/config.local.php
+	require "'$data_dir/data/config.local.user.php'";' >> $install_dir/config.local.php
 fi
 
 #=================================================
@@ -62,7 +62,6 @@ then
 	ynh_setup_source --dest_dir="$install_dir" --keep="config.local.php data/plugins"
 fi
 
-
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 

From 51673b653f7d2a0d8253ca3a3210c0e364f128fd Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 03:47:39 +0100
Subject: [PATCH 30/80] try add file and line to read
 /data/config.local.user.php

---
 scripts/upgrade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 88c3c6e..a20d411 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -42,12 +42,12 @@ if [ ! -f "$data_dir/data/config.local.user.php" ]; then
   ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
   chmod 650 "$data_dir/data/config.local.user.php"
   chown $app:$app "$data_dir/data/config.local.user.php"
-    echo'
+    echo "
 	/**
 	 * Chemin vers le fichier pour des configurations personnelles
 	 * qui ne sera pas écraser lors des mises à jour.
 	 */
-	require "'$data_dir/data/config.local.user.php'";' >> $install_dir/config.local.php
+	require \'$data_dir/data/config.local.user.php\';" >> $install_dir/config.local.php
 fi
 
 #=================================================

From f7eeae1efb61a9d4ff7b9a4d451edeb14d9f10e7 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 03:51:37 +0100
Subject: [PATCH 31/80] try add file and line to read
 /data/config.local.user.php

---
 scripts/upgrade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index a20d411..b42302c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -42,12 +42,12 @@ if [ ! -f "$data_dir/data/config.local.user.php" ]; then
   ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
   chmod 650 "$data_dir/data/config.local.user.php"
   chown $app:$app "$data_dir/data/config.local.user.php"
-    echo "
+  echo"
 	/**
 	 * Chemin vers le fichier pour des configurations personnelles
 	 * qui ne sera pas écraser lors des mises à jour.
 	 */
-	require \'$data_dir/data/config.local.user.php\';" >> $install_dir/config.local.php
+	require '$data_dir/data/config.local.user.php';" >> $install_dir/config.local.php
 fi
 
 #=================================================

From 70ca18683cfcf19adb808c0b7246f23e2a41f8bf Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 04:04:19 +0100
Subject: [PATCH 32/80] try add file and line to read
 /data/config.local.user.php

---
 scripts/upgrade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index b42302c..8e82fba 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -42,12 +42,12 @@ if [ ! -f "$data_dir/data/config.local.user.php" ]; then
   ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
   chmod 650 "$data_dir/data/config.local.user.php"
   chown $app:$app "$data_dir/data/config.local.user.php"
-  echo"
+  echo "
 	/**
 	 * Chemin vers le fichier pour des configurations personnelles
 	 * qui ne sera pas écraser lors des mises à jour.
 	 */
-	require '$data_dir/data/config.local.user.php';" >> $install_dir/config.local.php
+	require '__DATA_DIR__/data/config.local.user.php';" >> $install_dir/config.local.php
 fi
 
 #=================================================

From 7ce20a80858cd86f5ab63693b5cf1090435f73a5 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 04:09:35 +0100
Subject: [PATCH 33/80] try add file and line to read
 /data/config.local.user.php

---
 scripts/upgrade | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 8e82fba..08d91fb 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -33,22 +33,6 @@ fi
 # ADD SPECIFIC FILE IF NEEDED
 #=================================================
 
-# first add config file if not present
-if [ ! -f "$data_dir/data/config.local.user.php" ]; then
-
-	ynh_script_progression --message="Adding a configuration file..." --weight=5
-
-	ynh_script_progression --message=" files..." --weight=5
-  ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
-  chmod 650 "$data_dir/data/config.local.user.php"
-  chown $app:$app "$data_dir/data/config.local.user.php"
-  echo "
-	/**
-	 * Chemin vers le fichier pour des configurations personnelles
-	 * qui ne sera pas écraser lors des mises à jour.
-	 */
-	require '__DATA_DIR__/data/config.local.user.php';" >> $install_dir/config.local.php
-fi
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -65,6 +49,23 @@ fi
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
+# first add config file if not present
+if [ ! -f "$data_dir/data/config.local.user.php" ]; then
+
+	ynh_script_progression --message="Adding a configuration file..." --weight=5
+
+	ynh_script_progression --message=" files..." --weight=5
+  ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
+  chmod 650 "$data_dir/data/config.local.user.php"
+  chown $app:$app "$data_dir/data/config.local.user.php"
+  echo "
+/**
+ * Chemin vers le fichier pour des configurations personnelles
+ * qui ne sera pas écraser lors des mises à jour.
+ */
+require '$data_dir/data/config.local.user.php';" >> $install_dir/config.local.php
+fi
+
 #=================================================
 # REAPPLY SYSTEM CONFIGURATIONS
 #=================================================

From 567fc23d529756a8d5b64e73b14186bde557cb13 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 04:40:40 +0100
Subject: [PATCH 34/80] try add file and line to read
 /data/config.local.user.php

---
 conf/config.local.php      |  2 +-
 conf/config.local.user.php |  6 ++++--
 scripts/upgrade            | 31 +++++++++++++++----------------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/conf/config.local.php b/conf/config.local.php
index 1d513c6..a321ec9 100644
--- a/conf/config.local.php
+++ b/conf/config.local.php
@@ -8,7 +8,7 @@
  *
  * Pour ajouter des configurations personnelles à votre instance et les garder,
  * lisez attentivement ce fichier, puis ajoutez les constantes commentées nécessaires
- * dans le fichier '$data_dir/data/config.local.user.php'.
+ * dans le fichier __DATA_DIR__/data/config.local.user.php.
  */
 
 // Nécessaire pour situer les constantes dans le bon namespace
diff --git a/conf/config.local.user.php b/conf/config.local.user.php
index 9eff67f..88e4072 100644
--- a/conf/config.local.user.php
+++ b/conf/config.local.user.php
@@ -1,9 +1,11 @@
+<?php
+
 /**
  * Ce fichier est ici pour ajouter des personnalisations à votre configuration.
  *
  * Modifiez ce fichier à votre guise, excepté les constantes déjà présentes dans le fichier
- * '$install_dir/config.local.php', il ne sera pas modifié lors des prochaines mises à jour.
- * Consultez le fichier '$install_dir/config.local.php' pour disposer des constantes commentées
+ * __INSTALL_DIR__/config.local.php, il ne sera pas modifié lors des prochaines mises à jour.
+ * Consultez le fichier __INSTALL_DIR__/config.local.php pour choisir des constantes commentées
  * que vous voudriez éventuellemnt ajouter.
  */
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 08d91fb..5e6279d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -49,22 +49,6 @@ fi
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
-# first add config file if not present
-if [ ! -f "$data_dir/data/config.local.user.php" ]; then
-
-	ynh_script_progression --message="Adding a configuration file..." --weight=5
-
-	ynh_script_progression --message=" files..." --weight=5
-  ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
-  chmod 650 "$data_dir/data/config.local.user.php"
-  chown $app:$app "$data_dir/data/config.local.user.php"
-  echo "
-/**
- * Chemin vers le fichier pour des configurations personnelles
- * qui ne sera pas écraser lors des mises à jour.
- */
-require '$data_dir/data/config.local.user.php';" >> $install_dir/config.local.php
-fi
 
 #=================================================
 # REAPPLY SYSTEM CONFIGURATIONS
@@ -85,7 +69,22 @@ chmod 644 "/etc/cron.d/$app"
 # SPECIFIC UPGRADE
 #=================================================
 
+# add config file if not present
+if [ ! -f "$data_dir/data/config.local.user.php" ]; then
 
+	ynh_script_progression --message="Adding a configuration file..." --weight=5
+
+	ynh_script_progression --message=" files..." --weight=5
+  ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
+  chmod 650 "$data_dir/data/config.local.user.php"
+  chown $app:$app "$data_dir/data/config.local.user.php"
+  echo "
+/**
+ * Chemin vers le fichier pour des configurations personnelles
+ * qui ne sera pas écraser lors des mises à jour.
+ */
+require '$data_dir/data/config.local.user.php';" >> $install_dir/config.local.php
+fi
 
 #=================================================
 # END OF SCRIPT

From 3ab1bfd187d0a47f84890ebcf971c5ccf2b1ffed Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 05:38:50 +0100
Subject: [PATCH 35/80] try fix add require /data/congig.local/user.php in
 istall

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

diff --git a/conf/config.local.php b/conf/config.local.php
index a321ec9..b7a7263 100644
--- a/conf/config.local.php
+++ b/conf/config.local.php
@@ -890,4 +890,4 @@ const MAIL_SENDER = '__APP__@__DOMAIN__';
  * Chemin vers le fichier pour des configurations personnelles
  * qui ne sera pas écraser lors des mises à jour.
  */
-require '__DATA__DIR__/data/config.local.user.php';
+require DATA_ROOT . '/config.local.user.php';

From 921ba3e3c6870c04f80c0af0e21e86e0d36904b0 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 05:47:32 +0100
Subject: [PATCH 36/80] try fix install

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

diff --git a/conf/config.local.php b/conf/config.local.php
index b7a7263..87a77da 100644
--- a/conf/config.local.php
+++ b/conf/config.local.php
@@ -890,4 +890,4 @@ const MAIL_SENDER = '__APP__@__DOMAIN__';
  * Chemin vers le fichier pour des configurations personnelles
  * qui ne sera pas écraser lors des mises à jour.
  */
-require DATA_ROOT . '/config.local.user.php';
+require '__DATA_DIR__/data/config.local.user.php';

From 8eb4565bdaa88d19c6312dccdb33058fbc08b138 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 06:02:49 +0100
Subject: [PATCH 37/80] try fix install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 31188a1..d848767 100644
--- a/scripts/install
+++ b/scripts/install
@@ -18,7 +18,7 @@ ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key
 ynh_script_progression --message="Setting up source files..." --weight=4
 
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$data_dir"data/
+ynh_setup_source --dest_dir="$install_dir"
 
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"

From 60a8416ebf20d1918b168448e03842cb677d0a8f Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 06:19:52 +0100
Subject: [PATCH 38/80] try fix install

---
 scripts/install | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/scripts/install b/scripts/install
index d848767..98b3599 100644
--- a/scripts/install
+++ b/scripts/install
@@ -46,16 +46,15 @@ chmod 644 "/etc/cron.d/$app"
 ynh_script_progression --message="Adding a configuration file..." --weight=5
 
 # Install configuration files
-ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
-
-chmod 650 "$data_dir/data/config.local.user.php"
-chown $app:$app "$data_dir/data/config.local.user.php"
-
 ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
 
 chmod 650 "$install_dir/config.local.php"
 chown $app:$app "$install_dir/config.local.php"
 
+ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
+
+chmod 650 "$data_dir/data/config.local.user.php"
+chown $app:$app "$data_dir/data/config.local.user.php"
 
 #=================================================
 # END OF SCRIPT

From c1812dda3c61480f294092a7cfe447704bcfa2ab Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 06:25:22 +0100
Subject: [PATCH 39/80] try fix install

---
 scripts/install | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/scripts/install b/scripts/install
index 98b3599..34521fc 100644
--- a/scripts/install
+++ b/scripts/install
@@ -51,11 +51,6 @@ ynh_add_config --template="config.local.php" --destination="$install_dir/config.
 chmod 650 "$install_dir/config.local.php"
 chown $app:$app "$install_dir/config.local.php"
 
-ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
-
-chmod 650 "$data_dir/data/config.local.user.php"
-chown $app:$app "$data_dir/data/config.local.user.php"
-
 #=================================================
 # END OF SCRIPT
 #=================================================

From 967daf82d73210d27f33a7d0e5c1cfda837e49bf Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 06:27:48 +0100
Subject: [PATCH 40/80] try fix install

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

diff --git a/conf/config.local.php b/conf/config.local.php
index 87a77da..17b3536 100644
--- a/conf/config.local.php
+++ b/conf/config.local.php
@@ -890,4 +890,4 @@ const MAIL_SENDER = '__APP__@__DOMAIN__';
  * Chemin vers le fichier pour des configurations personnelles
  * qui ne sera pas écraser lors des mises à jour.
  */
-require '__DATA_DIR__/data/config.local.user.php';
+//require '__DATA_DIR__/data/config.local.user.php';

From 1b4f793e417f953af0bec3b396a9a10e530f1985 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 06:28:38 +0100
Subject: [PATCH 41/80] try fix install

---
 scripts/install | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/install b/scripts/install
index 34521fc..98b3599 100644
--- a/scripts/install
+++ b/scripts/install
@@ -51,6 +51,11 @@ ynh_add_config --template="config.local.php" --destination="$install_dir/config.
 chmod 650 "$install_dir/config.local.php"
 chown $app:$app "$install_dir/config.local.php"
 
+ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
+
+chmod 650 "$data_dir/data/config.local.user.php"
+chown $app:$app "$data_dir/data/config.local.user.php"
+
 #=================================================
 # END OF SCRIPT
 #=================================================

From e7b2138600d9d61508e787df60b0e1b50f8e8675 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 07:02:58 +0100
Subject: [PATCH 42/80] try fix install

---
 scripts/install | 5 -----
 scripts/upgrade | 2 ++
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/scripts/install b/scripts/install
index 98b3599..34521fc 100644
--- a/scripts/install
+++ b/scripts/install
@@ -51,11 +51,6 @@ ynh_add_config --template="config.local.php" --destination="$install_dir/config.
 chmod 650 "$install_dir/config.local.php"
 chown $app:$app "$install_dir/config.local.php"
 
-ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
-
-chmod 650 "$data_dir/data/config.local.user.php"
-chown $app:$app "$data_dir/data/config.local.user.php"
-
 #=================================================
 # END OF SCRIPT
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 5e6279d..1c2a8a2 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -84,6 +84,8 @@ if [ ! -f "$data_dir/data/config.local.user.php" ]; then
  * qui ne sera pas écraser lors des mises à jour.
  */
 require '$data_dir/data/config.local.user.php';" >> $install_dir/config.local.php
+else
+	ynh_replace_string --match_string="require '$data_dir/data/config.local.user.php';" --replace_string="//require '$data_dir/data/config.local.user.php';" --target_file="$install_dir/config.local.php"
 fi
 
 #=================================================

From 1d37be7796c177faa9362dbf270d8a417feccc98 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 07:06:26 +0100
Subject: [PATCH 43/80] try fix upgrade comment last line require

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 1c2a8a2..c0b1a6b 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -85,7 +85,7 @@ if [ ! -f "$data_dir/data/config.local.user.php" ]; then
  */
 require '$data_dir/data/config.local.user.php';" >> $install_dir/config.local.php
 else
-	ynh_replace_string --match_string="require '$data_dir/data/config.local.user.php';" --replace_string="//require '$data_dir/data/config.local.user.php';" --target_file="$install_dir/config.local.php"
+	ynh_replace_string --match_string="//require '$data_dir/data/config.local.user.php';" --replace_string="require '$data_dir/data/config.local.user.php';" --target_file="$install_dir/config.local.php"
 fi
 
 #=================================================

From bb9403fcf31ce60588e8996fc24bda660b2483b2 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 25 Dec 2023 07:19:24 +0100
Subject: [PATCH 44/80] explanation

---
 conf/config.local.php      | 4 ++--
 conf/config.local.user.php | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/conf/config.local.php b/conf/config.local.php
index 17b3536..b198f88 100644
--- a/conf/config.local.php
+++ b/conf/config.local.php
@@ -887,7 +887,7 @@ const MAIL_SENDER = '__APP__@__DOMAIN__';
 //const ALERT_MESSAGE = 'Ceci est un compte de test.';
 
 /**
- * Chemin vers le fichier pour des configurations personnelles
- * qui ne sera pas écraser lors des mises à jour.
+ * Chemin vers le fichier pour des configurations personnellesqui ne sera pas écraser
+ * lors des mises à jour. Cette ligne sera décommentée dès la première mise à jour.
  */
 //require '__DATA_DIR__/data/config.local.user.php';
diff --git a/conf/config.local.user.php b/conf/config.local.user.php
index 88e4072..b6966cb 100644
--- a/conf/config.local.user.php
+++ b/conf/config.local.user.php
@@ -3,10 +3,9 @@
 /**
  * Ce fichier est ici pour ajouter des personnalisations à votre configuration.
  *
- * Modifiez ce fichier à votre guise, excepté les constantes déjà présentes dans le fichier
+ * Modifiez ce fichier à votre guise, excepté les constantes déjà éditées dans le fichier
  * __INSTALL_DIR__/config.local.php, il ne sera pas modifié lors des prochaines mises à jour.
- * Consultez le fichier __INSTALL_DIR__/config.local.php pour choisir des constantes commentées
- * que vous voudriez éventuellemnt ajouter.
+ * Consultez le fichier __INSTALL_DIR__/config.local.php pour choisir des constantes à ajouter.
  */
 
 // Nécessaire pour situer les constantes dans le bon namespace

From 8595bbc22e9918e984e49d08106812911ff78160 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Thu, 28 Dec 2023 13:12:26 +0100
Subject: [PATCH 45/80] add directory /data if not present on older upgrades

---
 scripts/upgrade | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index c0b1a6b..6a971e1 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -49,7 +49,6 @@ fi
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
-
 #=================================================
 # REAPPLY SYSTEM CONFIGURATIONS
 #=================================================
@@ -68,13 +67,26 @@ chmod 644 "/etc/cron.d/$app"
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================
+# add the newest config.local.php from older version
+if ynh_compare_current_package_version --comparison lt --version 1.3.1~ynh1
+then
+  ynh_script_progression --message="Updating a configuration file..." --weight=5
+
+  ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
+  chmod 650 "$install_dir/config.local.php"
+  chown $app:$app "$install_dir/config.local.php"
+fi
 
 # add config file if not present
-if [ ! -f "$data_dir/data/config.local.user.php" ]; then
-
+if [ ! -d "$data_dir/data" ]; then
 	ynh_script_progression --message="Adding a configuration file..." --weight=5
+	mkdir "$data_dir/data"
+	chown $app:www-data "$data_dir/data"
+fi
+
+if [ ! -f "$data_dir/data/config.local.user.php" ]; then
+  ynh_script_progression --message="Adding a configuration file..." --weight=5
 
-	ynh_script_progression --message=" files..." --weight=5
   ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
   chmod 650 "$data_dir/data/config.local.user.php"
   chown $app:$app "$data_dir/data/config.local.user.php"

From b38485adcc1820db7e442794bfe0c50abb525002 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Thu, 28 Dec 2023 14:38:43 +0100
Subject: [PATCH 46/80] try more simple syntax

---
 conf/config.local.php      |  2 +-
 conf/config.local.user.php |  2 +-
 scripts/upgrade            | 32 +++++++++++++++-----------------
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/conf/config.local.php b/conf/config.local.php
index b198f88..0f2a47f 100644
--- a/conf/config.local.php
+++ b/conf/config.local.php
@@ -887,7 +887,7 @@ const MAIL_SENDER = '__APP__@__DOMAIN__';
 //const ALERT_MESSAGE = 'Ceci est un compte de test.';
 
 /**
- * Chemin vers le fichier pour des configurations personnellesqui ne sera pas écraser
+ * Chemin vers le fichier pour des configurations personnelles qui ne sera pas écraser
  * lors des mises à jour. Cette ligne sera décommentée dès la première mise à jour.
  */
 //require '__DATA_DIR__/data/config.local.user.php';
diff --git a/conf/config.local.user.php b/conf/config.local.user.php
index b6966cb..2bc71a6 100644
--- a/conf/config.local.user.php
+++ b/conf/config.local.user.php
@@ -9,4 +9,4 @@
  */
 
 // Nécessaire pour situer les constantes dans le bon namespace
-namespace Paheko;
\ No newline at end of file
+namespace Paheko;
diff --git a/scripts/upgrade b/scripts/upgrade
index 6a971e1..446d4e7 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -67,17 +67,22 @@ chmod 644 "/etc/cron.d/$app"
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================
-# add the newest config.local.php from older version
-if ynh_compare_current_package_version --comparison lt --version 1.3.1~ynh1
-then
-  ynh_script_progression --message="Updating a configuration file..." --weight=5
+# UPDATE A CONFIG FILE
+#=================================================
+ynh_script_progression --message="Updating a configuration file..." --weight=5
 
-  ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
-  chmod 650 "$install_dir/config.local.php"
-  chown $app:$app "$install_dir/config.local.php"
-fi
+# Install configuration files
+ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
+
+chmod 650 "$install_dir/config.local.php"
+chown $app:$app "$install_dir/config.local.php"
+
+ynh_replace_string --match_string="//require '$data_dir/data/config.local.user.php';" --replace_string="require '$data_dir/data/config.local.user.php';" --target_file="$install_dir/config.local.php"
+
+#=================================================
+# ADD A CONFIG FILE
+#=================================================
 
-# add config file if not present
 if [ ! -d "$data_dir/data" ]; then
 	ynh_script_progression --message="Adding a configuration file..." --weight=5
 	mkdir "$data_dir/data"
@@ -90,16 +95,9 @@ if [ ! -f "$data_dir/data/config.local.user.php" ]; then
   ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
   chmod 650 "$data_dir/data/config.local.user.php"
   chown $app:$app "$data_dir/data/config.local.user.php"
-  echo "
-/**
- * Chemin vers le fichier pour des configurations personnelles
- * qui ne sera pas écraser lors des mises à jour.
- */
-require '$data_dir/data/config.local.user.php';" >> $install_dir/config.local.php
-else
-	ynh_replace_string --match_string="//require '$data_dir/data/config.local.user.php';" --replace_string="require '$data_dir/data/config.local.user.php';" --target_file="$install_dir/config.local.php"
 fi
 
+
 #=================================================
 # END OF SCRIPT
 #=================================================

From 1fb2d95709541d275f24c2f8cb729555582ec38d Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Thu, 28 Dec 2023 16:19:11 +0100
Subject: [PATCH 47/80] add special directives when upgrade from version 1.2.8

---
 scripts/upgrade | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 446d4e7..8ac56f9 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -30,9 +30,18 @@ if [ -z "${secret_key:-}" ]; then
 fi
 
 #=================================================
-# ADD SPECIFIC FILE IF NEEDED
+# KEEP DATA IF NEEDED
 #=================================================
-
+if ynh_app_upstream_version --manifest="1.2.8"
+then
+  mv "$install_dir/config.local.php" "$install_dir/config.local.php.old"
+  mv "$install_dir/config.local.yunohost.php" "$install_dir/config.local.php"
+  chmod 650 "$install_dir/config.local.php"
+  chown $app:$app "$install_dir/config.local.php"
+  ynh_secure_remove "$install_dir/config.local.php.old"
+  ynh_secure_remove "$install_dir/config.local.user.php"
+  ynn_secure_remove "$install_dir/data/data"
+fi
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE

From d1bb59c6ddf7e746c4f7ebb016af19aa9045516b Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Thu, 28 Dec 2023 16:22:37 +0100
Subject: [PATCH 48/80] wrong syntax

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 8ac56f9..3b639bc 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -40,7 +40,7 @@ then
   chown $app:$app "$install_dir/config.local.php"
   ynh_secure_remove "$install_dir/config.local.php.old"
   ynh_secure_remove "$install_dir/config.local.user.php"
-  ynn_secure_remove "$install_dir/data/data"
+  ynh_secure_remove "$install_dir/data/data"
 fi
 
 #=================================================

From 01179601d3dc639cf2c3418171724c0393b1e8ef Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Thu, 28 Dec 2023 16:38:43 +0100
Subject: [PATCH 49/80] directive added when upgrading from 1.2.8 to corret
 move db files

---
 scripts/upgrade | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index 3b639bc..b873a92 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -98,6 +98,10 @@ if [ ! -d "$data_dir/data" ]; then
 	chown $app:www-data "$data_dir/data"
 fi
 
+if [ ! -f "$install_dir/data/association.sqlite" ]; then
+	mv "$install_dir/data/association.*" "$data_dir/data/"
+fi
+
 if [ ! -f "$data_dir/data/config.local.user.php" ]; then
   ynh_script_progression --message="Adding a configuration file..." --weight=5
 

From 7138dc6bcb5baaaee1c5f53f3d997bdc1e561418 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Thu, 28 Dec 2023 16:52:23 +0100
Subject: [PATCH 50/80] directive added when upgrading from 1.2.8 to correct
 moving db files

---
 scripts/upgrade | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index b873a92..3b57160 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -98,9 +98,6 @@ if [ ! -d "$data_dir/data" ]; then
 	chown $app:www-data "$data_dir/data"
 fi
 
-if [ ! -f "$install_dir/data/association.sqlite" ]; then
-	mv "$install_dir/data/association.*" "$data_dir/data/"
-fi
 
 if [ ! -f "$data_dir/data/config.local.user.php" ]; then
   ynh_script_progression --message="Adding a configuration file..." --weight=5
@@ -110,6 +107,10 @@ if [ ! -f "$data_dir/data/config.local.user.php" ]; then
   chown $app:$app "$data_dir/data/config.local.user.php"
 fi
 
+if [ ! -f "$install_dir/data/association.sqlite" ]; then
+	mv "$install_dir/data/association.*" "$data_dir/data/"
+	ynh_secure_remove "$install_dir/data/association.*"
+fi
 
 #=================================================
 # END OF SCRIPT

From 3a4ddad94afbb71916a5304793eed06eba7df732 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Thu, 28 Dec 2023 16:56:46 +0100
Subject: [PATCH 51/80] directive added when upgrading from 1.2.8 to correct
 moving db files

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 3b57160..9095e54 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -107,7 +107,7 @@ if [ ! -f "$data_dir/data/config.local.user.php" ]; then
   chown $app:$app "$data_dir/data/config.local.user.php"
 fi
 
-if [ ! -f "$install_dir/data/association.sqlite" ]; then
+if [ -f "$install_dir/data/association.sqlite" ]; then
 	mv "$install_dir/data/association.*" "$data_dir/data/"
 	ynh_secure_remove "$install_dir/data/association.*"
 fi

From 15682502a6070ee2eedad93743286205d51b78e8 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Thu, 28 Dec 2023 17:01:57 +0100
Subject: [PATCH 52/80] directive added when upgrading from 1.2.8 to correct
 moving db files

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 9095e54..abb8873 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -108,7 +108,7 @@ if [ ! -f "$data_dir/data/config.local.user.php" ]; then
 fi
 
 if [ -f "$install_dir/data/association.sqlite" ]; then
-	mv "$install_dir/data/association.*" "$data_dir/data/"
+	mv "$install_dir/data/association*" "$data_dir/data/"
 	ynh_secure_remove "$install_dir/data/association.*"
 fi
 

From 693e23b577c8ff30f2746fb7e872f335fe47185e Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Thu, 28 Dec 2023 17:12:55 +0100
Subject: [PATCH 53/80] directive added when upgrading from 1.2.8 to correct
 moving db files

---
 scripts/upgrade | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index abb8873..7f51bb3 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -98,7 +98,6 @@ if [ ! -d "$data_dir/data" ]; then
 	chown $app:www-data "$data_dir/data"
 fi
 
-
 if [ ! -f "$data_dir/data/config.local.user.php" ]; then
   ynh_script_progression --message="Adding a configuration file..." --weight=5
 
@@ -108,7 +107,7 @@ if [ ! -f "$data_dir/data/config.local.user.php" ]; then
 fi
 
 if [ -f "$install_dir/data/association.sqlite" ]; then
-	mv "$install_dir/data/association*" "$data_dir/data/"
+	mv "$install_dir/data/*.sqlite" "$data_dir/data/"
 	ynh_secure_remove "$install_dir/data/association.*"
 fi
 

From 9c0aa9a58481d9a23316fd1d1aee68a6fa0e474a Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Thu, 28 Dec 2023 17:19:55 +0100
Subject: [PATCH 54/80] directive added when upgrading from 1.2.8 to correct
 moving db files

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 7f51bb3..4c79825 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -107,7 +107,7 @@ if [ ! -f "$data_dir/data/config.local.user.php" ]; then
 fi
 
 if [ -f "$install_dir/data/association.sqlite" ]; then
-	mv "$install_dir/data/*.sqlite" "$data_dir/data/"
+	mv $install_dir/data/association.*  $data_dir/data/
 	ynh_secure_remove "$install_dir/data/association.*"
 fi
 

From d2bc034bb2b12ee9c44b014f45f0ac1301599ae1 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Thu, 28 Dec 2023 18:23:32 +0100
Subject: [PATCH 55/80] correct some permissions for thr directory /data

---
 scripts/upgrade | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 4c79825..a7ac3ce 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -95,7 +95,8 @@ ynh_replace_string --match_string="//require '$data_dir/data/config.local.user.p
 if [ ! -d "$data_dir/data" ]; then
 	ynh_script_progression --message="Adding a configuration file..." --weight=5
 	mkdir "$data_dir/data"
-	chown $app:www-data "$data_dir/data"
+	chmod 770 "$data_dir/data"
+	chown -R $app:www-data "$data_dir/data"
 fi
 
 if [ ! -f "$data_dir/data/config.local.user.php" ]; then

From b1c2c0e8d75ce8f9a2bd2d6da4c09f79dc59e01f Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Thu, 28 Dec 2023 18:46:34 +0100
Subject: [PATCH 56/80] need the script ynh_app_upstream_version not applied if
 upgrade force

---
 scripts/upgrade | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index a7ac3ce..a595bd4 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -34,13 +34,16 @@ fi
 #=================================================
 if ynh_app_upstream_version --manifest="1.2.8"
 then
-  mv "$install_dir/config.local.php" "$install_dir/config.local.php.old"
-  mv "$install_dir/config.local.yunohost.php" "$install_dir/config.local.php"
-  chmod 650 "$install_dir/config.local.php"
-  chown $app:$app "$install_dir/config.local.php"
-  ynh_secure_remove "$install_dir/config.local.php.old"
-  ynh_secure_remove "$install_dir/config.local.user.php"
-  ynh_secure_remove "$install_dir/data/data"
+	ynh_script_progression --message="cleaning conf files..." --weight=5
+	mv "$install_dir/config.local.php" "$install_dir/config.local.php.old"
+	mv "$install_dir/config.local.yunohost.php" "$install_dir/config.local.php"
+	chmod 650 "$install_dir/config.local.php"
+	chown $app:$app "$install_dir/config.local.php"
+	ynh_secure_remove "$install_dir/config.local.php.old"
+	ynh_secure_remove "$install_dir/config.local.user.php"
+	ynh_secure_remove "$install_dir/data/data"
+else
+	ynh_script_progression --message="next steps upgrade..." --weight=2
 fi
 
 #=================================================

From c156ef4647c434d932e4409d198751cd68abcc9e Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Thu, 28 Dec 2023 18:57:03 +0100
Subject: [PATCH 57/80] need applied only when version 1.2.8

---
 scripts/upgrade | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index a595bd4..b662f29 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -32,7 +32,7 @@ fi
 #=================================================
 # KEEP DATA IF NEEDED
 #=================================================
-if ynh_app_upstream_version --manifest="1.2.8"
+if ynh_compare_current_package_version --comparison eq --version 1.2.8~ynh1
 then
 	ynh_script_progression --message="cleaning conf files..." --weight=5
 	mv "$install_dir/config.local.php" "$install_dir/config.local.php.old"
@@ -42,8 +42,6 @@ then
 	ynh_secure_remove "$install_dir/config.local.php.old"
 	ynh_secure_remove "$install_dir/config.local.user.php"
 	ynh_secure_remove "$install_dir/data/data"
-else
-	ynh_script_progression --message="next steps upgrade..." --weight=2
 fi
 
 #=================================================

From 7c70a788c0cbad6e222f28bb046df0f082e5aa94 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Thu, 28 Dec 2023 19:05:14 +0100
Subject: [PATCH 58/80] aplly correct chown for files in /data

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index b662f29..96975aa 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -97,7 +97,7 @@ if [ ! -d "$data_dir/data" ]; then
 	ynh_script_progression --message="Adding a configuration file..." --weight=5
 	mkdir "$data_dir/data"
 	chmod 770 "$data_dir/data"
-	chown -R $app:www-data "$data_dir/data"
+	chown -R $app:www-data "$data_dir/data/"
 fi
 
 if [ ! -f "$data_dir/data/config.local.user.php" ]; then

From 8f822997641960de0811a2f1fcbc22b3ba73e504 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Thu, 28 Dec 2023 20:04:25 +0100
Subject: [PATCH 59/80] add ynh_store_file_checksum if file /config.local.php
 changed for 1.2.8

---
 scripts/upgrade | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index 96975aa..4fbc81c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -39,6 +39,7 @@ then
 	mv "$install_dir/config.local.yunohost.php" "$install_dir/config.local.php"
 	chmod 650 "$install_dir/config.local.php"
 	chown $app:$app "$install_dir/config.local.php"
+	ynh_store_file_checksum --file="$install_dir/config.local.php"
 	ynh_secure_remove "$install_dir/config.local.php.old"
 	ynh_secure_remove "$install_dir/config.local.user.php"
 	ynh_secure_remove "$install_dir/data/data"

From ec5428d0ed31dbe0fbb94105d5314526dab47e64 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Fri, 29 Dec 2023 16:14:39 +0100
Subject: [PATCH 60/80] conditions for keep configs if needed

---
 scripts/upgrade | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 4fbc81c..34f3c4e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -30,9 +30,10 @@ if [ -z "${secret_key:-}" ]; then
 fi
 
 #=================================================
-# KEEP DATA IF NEEDED
+# KEEP CONFIGS IF NEEDED
 #=================================================
-if ynh_compare_current_package_version --comparison eq --version 1.2.8~ynh1
+
+if [ -f "$install_dir/config.local.yunohost.php" ]
 then
 	ynh_script_progression --message="cleaning conf files..." --weight=5
 	mv "$install_dir/config.local.php" "$install_dir/config.local.php.old"
@@ -41,7 +42,19 @@ then
 	chown $app:$app "$install_dir/config.local.php"
 	ynh_store_file_checksum --file="$install_dir/config.local.php"
 	ynh_secure_remove "$install_dir/config.local.php.old"
+fi
+
+ynh_script_progression --message="removing old conf files if exists..." --weight=5
+
+if [ -f "$install_dir/config.local.user.php" ]; then
 	ynh_secure_remove "$install_dir/config.local.user.php"
+fi
+
+if [ -f "$install_dir/data/config.local.user.php" ]; then
+	ynh_secure_remove "$install_dir/data/config.local.user.php"
+fi
+
+if [ -f "$install_dir/data/data" ]; then
 	ynh_secure_remove "$install_dir/data/data"
 fi
 
@@ -95,7 +108,7 @@ ynh_replace_string --match_string="//require '$data_dir/data/config.local.user.p
 #=================================================
 
 if [ ! -d "$data_dir/data" ]; then
-	ynh_script_progression --message="Adding a configuration file..." --weight=5
+	ynh_script_progression --message="Adding a configuration directory..." --weight=5
 	mkdir "$data_dir/data"
 	chmod 770 "$data_dir/data"
 	chown -R $app:www-data "$data_dir/data/"
@@ -103,13 +116,13 @@ fi
 
 if [ ! -f "$data_dir/data/config.local.user.php" ]; then
   ynh_script_progression --message="Adding a configuration file..." --weight=5
-
   ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
   chmod 650 "$data_dir/data/config.local.user.php"
   chown $app:$app "$data_dir/data/config.local.user.php"
 fi
 
 if [ -f "$install_dir/data/association.sqlite" ]; then
+	ynh_script_progression --message="Moving db files..." --weight=5
 	mv $install_dir/data/association.*  $data_dir/data/
 	ynh_secure_remove "$install_dir/data/association.*"
 fi

From c24d13169f6c9a94ce9d614c07f524a53cdd0683 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Fri, 29 Dec 2023 16:23:41 +0100
Subject: [PATCH 61/80] conditions for keep configs if needed

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 34f3c4e..3d2f360 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -54,7 +54,7 @@ if [ -f "$install_dir/data/config.local.user.php" ]; then
 	ynh_secure_remove "$install_dir/data/config.local.user.php"
 fi
 
-if [ -f "$install_dir/data/data" ]; then
+if [ -d "$install_dir/data/data" ]; then
 	ynh_secure_remove "$install_dir/data/data"
 fi
 

From b7cffdfc208d03152463cddaa8d6021c3d4d4c07 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Fri, 29 Dec 2023 16:42:00 +0100
Subject: [PATCH 62/80] keep correct permissions

---
 scripts/upgrade | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 3d2f360..899e127 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -111,7 +111,11 @@ if [ ! -d "$data_dir/data" ]; then
 	ynh_script_progression --message="Adding a configuration directory..." --weight=5
 	mkdir "$data_dir/data"
 	chmod 770 "$data_dir/data"
-	chown -R $app:www-data "$data_dir/data/"
+	chown -R $app:www-data "$data_dir/data"
+else
+  chown -R $app:www-data "$data_dir/cache"
+  chown $app:www-data "$data_dir/index.html"
+
 fi
 
 if [ ! -f "$data_dir/data/config.local.user.php" ]; then

From bff8359a4297f625b7b37dfdfaeb999a1531e35b Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Fri, 29 Dec 2023 16:45:37 +0100
Subject: [PATCH 63/80] keep correct permissions

---
 scripts/upgrade | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 899e127..a6ff68c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -113,9 +113,8 @@ if [ ! -d "$data_dir/data" ]; then
 	chmod 770 "$data_dir/data"
 	chown -R $app:www-data "$data_dir/data"
 else
-  chown -R $app:www-data "$data_dir/cache"
-  chown $app:www-data "$data_dir/index.html"
-
+  chown -R $app:www-data "$data_dir/data/cache"
+  chown $app:www-data "$data_dir/data/index.html"
 fi
 
 if [ ! -f "$data_dir/data/config.local.user.php" ]; then

From bae8a604c7aa081d8406b39e56dfd83cd8625f5a Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Fri, 29 Dec 2023 16:59:40 +0100
Subject: [PATCH 64/80] prefer  variable __INSTALL_DIR__

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

diff --git a/conf/config.local.php b/conf/config.local.php
index 0f2a47f..18b2068 100644
--- a/conf/config.local.php
+++ b/conf/config.local.php
@@ -2,7 +2,7 @@
 
 /**
  * Ce fichier représente un exemple des constantes de configuration
- * disponibles pour Paheko. Il est bâti depuis une copie du fichier '$install_dir/config.dist.php'
+ * disponibles pour Paheko. Il est bâti depuis une copie du fichier __INSTALL_DIR__/config.dist.php
  *
  * NE PAS MODIFIER LES VALEURS PRÉSENTES DÉCOMMENTÉES DANS CE FICHIER!
  *

From 8aeb9461f8686465e9dde630d60f53316c7cbb51 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Sat, 30 Dec 2023 16:51:11 +0100
Subject: [PATCH 65/80] add config.local.user.php on data_dir/data directory

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

diff --git a/manifest.toml b/manifest.toml
index 8d51438..2699c0b 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "Paheko"
 description.en = "Association management software"
 description.fr = "Logiciel de gestion d'association"
 
-version = "1.3.5~ynh1"
+version = "1.3.5~ynh2"
 
 maintainers = ["rodinux"]
 

From 3fef69f06088e56df2b1c1f99e953a2e3dc055a9 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Sat, 30 Dec 2023 15:51:21 +0000
Subject: [PATCH 66/80] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 934e3bd..9a34250 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 Paheko (a word from the Māori language meaning "to cooperate", illustrating the purpose of the software: to improve together the daily management of an association) is software for associative management. It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members. 
 
 
-**Shipped version:** 1.3.5~ynh1
+**Shipped version:** 1.3.5~ynh2
 
 **Demo:** https://paheko.cloud/essai/
 
diff --git a/README_fr.md b/README_fr.md
index 8d48924..5f77b69 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 Paheko (mot de la langue Māori qui signifie « coopérer », illustrant le but du logiciel : améliorer ensemble le quotidien de la gestion d'une association) est un logiciel de gestion associative. Il est l'outil de prédilection pour gérer une association, un club sportif, une ONG, etc. Il est conçu pour répondre aux besoins d'une structure de petite à moyenne taille : gestion des adhérents, comptabilité, site web, prise de notes en réunion, archivage et partage des documents de fonctionnement de l'association, discussion entre adhérents.
 
 
-**Version incluse :** 1.3.5~ynh1
+**Version incluse :** 1.3.5~ynh2
 
 **Démo :** https://paheko.cloud/essai/
 

From 45daca59671878f3a4f5a07b739c24ce30e91ac6 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Sat, 30 Dec 2023 17:29:42 +0100
Subject: [PATCH 67/80] add admin instructions

---
 doc/ADMIN.md    | 10 +++++++++-
 doc/ADMIN_fr.md | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/doc/ADMIN.md b/doc/ADMIN.md
index e2ea899..2ea8220 100644
--- a/doc/ADMIN.md
+++ b/doc/ADMIN.md
@@ -1,3 +1,11 @@
-If you wish, you can add custom configurations inside `__INSTALL_DIR__/config.local.php`.
+If you wish, you can add custom configurations inside `__DATA_DIR__/data/config.local.user.php`.
+
+Use the `__DATA-DIR__/data` folder if you want to store documents elsewhere than in the database. Example in `__DATA_DIR__/data/config.local.user.php` file
+
+```
+const FILE_STORAGE_BACKEND = 'FileSystem';
+
+const FILE_STORAGE_CONFIG = DATA_ROOT . /files';
+``` 
 
 **Important**: for some reason, email does not work when installing on a subpath. You are encouraged to use a full, dedicated for this domain (with path set to /)
diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md
index 104f67e..3ff8959 100644
--- a/doc/ADMIN_fr.md
+++ b/doc/ADMIN_fr.md
@@ -1,4 +1,12 @@
-Vous pouvez si vous le souhaitez ajouter des configurations personnelles en éditant le fichier `__INSTALL_DIR__/config.local.php`.
+Vous pouvez si vous le souhaitez ajouter des configurations personnelles en éditant le fichier `__DATA_DIR__/data/config.local.user.php`.
+
+Privilégiez le dossier `__DATA-DIR__/data` si vous voulez conserver des documents ailleurs que dans la base de données. Example dans le fichier `__DATA_DIR__/data/config.local.user.php`
+
+```
+const FILE_STORAGE_BACKEND = 'FileSystem';
+
+const FILE_STORAGE_CONFIG = DATA_ROOT . '/files';
+``` 
 
 **Important** : Pour une raison quelconque, le courriel ne fonctionne pas lors de l’installation sur une sous-instance. Nous vous encourageons à utiliser un nom de domaine complet dédié à ce domaine (avec le chemin défini sur /).
 

From 58053e20ea3ca6b92595d6e591743ef6daccc439 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 1 Jan 2024 21:27:33 +0100
Subject: [PATCH 68/80] fix permisions on folders

---
 scripts/install |  6 +++++-
 scripts/restore |  6 +++++-
 scripts/upgrade | 12 +++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/scripts/install b/scripts/install
index 34521fc..e5cc70e 100644
--- a/scripts/install
+++ b/scripts/install
@@ -20,8 +20,9 @@ ynh_script_progression --message="Setting up source files..." --weight=4
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir"
 
-chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
+chmod -R u=rX,g=X,o= "$install_dir"
+chmod -R u=rX,g=rX,o= "$install_dir/www"
 
 #=================================================
 # SYSTEM CONFIGURATION
@@ -51,6 +52,9 @@ ynh_add_config --template="config.local.php" --destination="$install_dir/config.
 chmod 650 "$install_dir/config.local.php"
 chown $app:$app "$install_dir/config.local.php"
 
+chown -R $app:www-data "$data_dir/"
+chmod -R u=rwX,g=,o= "$data_dir/"
+
 #=================================================
 # END OF SCRIPT
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index c778d29..e5c1ce7 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -17,8 +17,9 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
 
 ynh_restore_file --origin_path="$install_dir"
 
-chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
+chmod -R u=rX,g=X,o= "$install_dir"
+chmod -R u=rX,g=rX,o= "$install_dir/www"
 
 #=================================================
 # RESTORE THE DATA DIRECTORY
@@ -27,6 +28,9 @@ ynh_script_progression --message="Restoring the data directory..." --weight=1
 
 ynh_restore_file --origin_path="$data_dir" --not_mandatory
 
+chown -R $app:www-data "$data_dir/"
+chmod -R u=rwX,g=,o= "$data_dir/"
+
 #=================================================
 # RESTORE SYSTEM CONFIGURATIONS
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index a6ff68c..b5aae11 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -70,8 +70,8 @@ then
 	ynh_setup_source --dest_dir="$install_dir" --keep="config.local.php data/plugins"
 fi
 
-chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
+chmod 650 "$install_dir/config.local.php"
+chown $app:$app "$install_dir/config.local.php"
 
 #=================================================
 # REAPPLY SYSTEM CONFIGURATIONS
@@ -103,6 +103,8 @@ chown $app:$app "$install_dir/config.local.php"
 
 ynh_replace_string --match_string="//require '$data_dir/data/config.local.user.php';" --replace_string="require '$data_dir/data/config.local.user.php';" --target_file="$install_dir/config.local.php"
 
+chmod -R u=rX,g=X,o= "$install_dir"
+chmod -R u=rX,g=rX,o= "$install_dir/www"
 #=================================================
 # ADD A CONFIG FILE
 #=================================================
@@ -110,11 +112,11 @@ ynh_replace_string --match_string="//require '$data_dir/data/config.local.user.p
 if [ ! -d "$data_dir/data" ]; then
 	ynh_script_progression --message="Adding a configuration directory..." --weight=5
 	mkdir "$data_dir/data"
-	chmod 770 "$data_dir/data"
 	chown -R $app:www-data "$data_dir/data"
+	chmod -R u=rwX,g=,o= "$data_dir/data"
 else
-  chown -R $app:www-data "$data_dir/data/cache"
-  chown $app:www-data "$data_dir/data/index.html"
+  chown -R $app:www-data "$data_dir/data"
+  chmod -R u=rwX,g=,o= "$data_dir/data"
 fi
 
 if [ ! -f "$data_dir/data/config.local.user.php" ]; then

From 678cdaddd38bc93ad0f985f96c4374a6bc2108ae Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 1 Jan 2024 21:45:36 +0100
Subject: [PATCH 69/80] Revert "add admin instructions"

This reverts commit 45daca59671878f3a4f5a07b739c24ce30e91ac6.
---
 doc/ADMIN.md    | 10 +---------
 doc/ADMIN_fr.md | 10 +---------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/doc/ADMIN.md b/doc/ADMIN.md
index 2ea8220..e2ea899 100644
--- a/doc/ADMIN.md
+++ b/doc/ADMIN.md
@@ -1,11 +1,3 @@
-If you wish, you can add custom configurations inside `__DATA_DIR__/data/config.local.user.php`.
-
-Use the `__DATA-DIR__/data` folder if you want to store documents elsewhere than in the database. Example in `__DATA_DIR__/data/config.local.user.php` file
-
-```
-const FILE_STORAGE_BACKEND = 'FileSystem';
-
-const FILE_STORAGE_CONFIG = DATA_ROOT . /files';
-``` 
+If you wish, you can add custom configurations inside `__INSTALL_DIR__/config.local.php`.
 
 **Important**: for some reason, email does not work when installing on a subpath. You are encouraged to use a full, dedicated for this domain (with path set to /)
diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md
index 3ff8959..104f67e 100644
--- a/doc/ADMIN_fr.md
+++ b/doc/ADMIN_fr.md
@@ -1,12 +1,4 @@
-Vous pouvez si vous le souhaitez ajouter des configurations personnelles en éditant le fichier `__DATA_DIR__/data/config.local.user.php`.
-
-Privilégiez le dossier `__DATA-DIR__/data` si vous voulez conserver des documents ailleurs que dans la base de données. Example dans le fichier `__DATA_DIR__/data/config.local.user.php`
-
-```
-const FILE_STORAGE_BACKEND = 'FileSystem';
-
-const FILE_STORAGE_CONFIG = DATA_ROOT . '/files';
-``` 
+Vous pouvez si vous le souhaitez ajouter des configurations personnelles en éditant le fichier `__INSTALL_DIR__/config.local.php`.
 
 **Important** : Pour une raison quelconque, le courriel ne fonctionne pas lors de l’installation sur une sous-instance. Nous vous encourageons à utiliser un nom de domaine complet dédié à ce domaine (avec le chemin défini sur /).
 

From 785329864573683ed41ac54d88958fc9515828ed Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Mon, 1 Jan 2024 21:54:53 +0100
Subject: [PATCH 70/80] back to precedent commit !

---
 doc/ADMIN.md    | 10 +++++++++-
 doc/ADMIN_fr.md | 10 +++++++++-
 scripts/install |  6 +-----
 scripts/restore |  6 +-----
 scripts/upgrade | 12 +++++-------
 5 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/doc/ADMIN.md b/doc/ADMIN.md
index e2ea899..2ea8220 100644
--- a/doc/ADMIN.md
+++ b/doc/ADMIN.md
@@ -1,3 +1,11 @@
-If you wish, you can add custom configurations inside `__INSTALL_DIR__/config.local.php`.
+If you wish, you can add custom configurations inside `__DATA_DIR__/data/config.local.user.php`.
+
+Use the `__DATA-DIR__/data` folder if you want to store documents elsewhere than in the database. Example in `__DATA_DIR__/data/config.local.user.php` file
+
+```
+const FILE_STORAGE_BACKEND = 'FileSystem';
+
+const FILE_STORAGE_CONFIG = DATA_ROOT . /files';
+``` 
 
 **Important**: for some reason, email does not work when installing on a subpath. You are encouraged to use a full, dedicated for this domain (with path set to /)
diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md
index 104f67e..3ff8959 100644
--- a/doc/ADMIN_fr.md
+++ b/doc/ADMIN_fr.md
@@ -1,4 +1,12 @@
-Vous pouvez si vous le souhaitez ajouter des configurations personnelles en éditant le fichier `__INSTALL_DIR__/config.local.php`.
+Vous pouvez si vous le souhaitez ajouter des configurations personnelles en éditant le fichier `__DATA_DIR__/data/config.local.user.php`.
+
+Privilégiez le dossier `__DATA-DIR__/data` si vous voulez conserver des documents ailleurs que dans la base de données. Example dans le fichier `__DATA_DIR__/data/config.local.user.php`
+
+```
+const FILE_STORAGE_BACKEND = 'FileSystem';
+
+const FILE_STORAGE_CONFIG = DATA_ROOT . '/files';
+``` 
 
 **Important** : Pour une raison quelconque, le courriel ne fonctionne pas lors de l’installation sur une sous-instance. Nous vous encourageons à utiliser un nom de domaine complet dédié à ce domaine (avec le chemin défini sur /).
 
diff --git a/scripts/install b/scripts/install
index e5cc70e..34521fc 100644
--- a/scripts/install
+++ b/scripts/install
@@ -20,9 +20,8 @@ ynh_script_progression --message="Setting up source files..." --weight=4
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir"
 
+chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
-chmod -R u=rX,g=X,o= "$install_dir"
-chmod -R u=rX,g=rX,o= "$install_dir/www"
 
 #=================================================
 # SYSTEM CONFIGURATION
@@ -52,9 +51,6 @@ ynh_add_config --template="config.local.php" --destination="$install_dir/config.
 chmod 650 "$install_dir/config.local.php"
 chown $app:$app "$install_dir/config.local.php"
 
-chown -R $app:www-data "$data_dir/"
-chmod -R u=rwX,g=,o= "$data_dir/"
-
 #=================================================
 # END OF SCRIPT
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index e5c1ce7..c778d29 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -17,9 +17,8 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
 
 ynh_restore_file --origin_path="$install_dir"
 
+chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
-chmod -R u=rX,g=X,o= "$install_dir"
-chmod -R u=rX,g=rX,o= "$install_dir/www"
 
 #=================================================
 # RESTORE THE DATA DIRECTORY
@@ -28,9 +27,6 @@ ynh_script_progression --message="Restoring the data directory..." --weight=1
 
 ynh_restore_file --origin_path="$data_dir" --not_mandatory
 
-chown -R $app:www-data "$data_dir/"
-chmod -R u=rwX,g=,o= "$data_dir/"
-
 #=================================================
 # RESTORE SYSTEM CONFIGURATIONS
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index b5aae11..a6ff68c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -70,8 +70,8 @@ then
 	ynh_setup_source --dest_dir="$install_dir" --keep="config.local.php data/plugins"
 fi
 
-chmod 650 "$install_dir/config.local.php"
-chown $app:$app "$install_dir/config.local.php"
+chmod -R o-rwx "$install_dir"
+chown -R $app:www-data "$install_dir"
 
 #=================================================
 # REAPPLY SYSTEM CONFIGURATIONS
@@ -103,8 +103,6 @@ chown $app:$app "$install_dir/config.local.php"
 
 ynh_replace_string --match_string="//require '$data_dir/data/config.local.user.php';" --replace_string="require '$data_dir/data/config.local.user.php';" --target_file="$install_dir/config.local.php"
 
-chmod -R u=rX,g=X,o= "$install_dir"
-chmod -R u=rX,g=rX,o= "$install_dir/www"
 #=================================================
 # ADD A CONFIG FILE
 #=================================================
@@ -112,11 +110,11 @@ chmod -R u=rX,g=rX,o= "$install_dir/www"
 if [ ! -d "$data_dir/data" ]; then
 	ynh_script_progression --message="Adding a configuration directory..." --weight=5
 	mkdir "$data_dir/data"
+	chmod 770 "$data_dir/data"
 	chown -R $app:www-data "$data_dir/data"
-	chmod -R u=rwX,g=,o= "$data_dir/data"
 else
-  chown -R $app:www-data "$data_dir/data"
-  chmod -R u=rwX,g=,o= "$data_dir/data"
+  chown -R $app:www-data "$data_dir/data/cache"
+  chown $app:www-data "$data_dir/data/index.html"
 fi
 
 if [ ! -f "$data_dir/data/config.local.user.php" ]; then

From 6c1307768566236a11023a47f6fae15c7e3c444c Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Wed, 3 Jan 2024 10:22:09 +0100
Subject: [PATCH 71/80] correct typo

---
 doc/ADMIN.md    | 2 +-
 doc/ADMIN_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/ADMIN.md b/doc/ADMIN.md
index 2ea8220..913363b 100644
--- a/doc/ADMIN.md
+++ b/doc/ADMIN.md
@@ -1,6 +1,6 @@
 If you wish, you can add custom configurations inside `__DATA_DIR__/data/config.local.user.php`.
 
-Use the `__DATA-DIR__/data` folder if you want to store documents elsewhere than in the database. Example in `__DATA_DIR__/data/config.local.user.php` file
+Use the `__DATA_DIR__/data` folder if you want to store documents elsewhere than in the database. Example in `__DATA_DIR__/data/config.local.user.php` file
 
 ```
 const FILE_STORAGE_BACKEND = 'FileSystem';
diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md
index 3ff8959..d63e487 100644
--- a/doc/ADMIN_fr.md
+++ b/doc/ADMIN_fr.md
@@ -1,6 +1,6 @@
 Vous pouvez si vous le souhaitez ajouter des configurations personnelles en éditant le fichier `__DATA_DIR__/data/config.local.user.php`.
 
-Privilégiez le dossier `__DATA-DIR__/data` si vous voulez conserver des documents ailleurs que dans la base de données. Example dans le fichier `__DATA_DIR__/data/config.local.user.php`
+Privilégiez le dossier `__DATA_DIR__/data` si vous voulez conserver des documents ailleurs que dans la base de données. Example dans le fichier `__DATA_DIR__/data/config.local.user.php`
 
 ```
 const FILE_STORAGE_BACKEND = 'FileSystem';

From c39fa209bd93a05ad795a83551b61163f3424779 Mon Sep 17 00:00:00 2001
From: Robles Rodolphe <rodolphe.robles@sfr.fr>
Date: Wed, 3 Jan 2024 10:28:14 +0100
Subject: [PATCH 72/80] Update scripts/upgrade

ok

Co-authored-by: Florent <florent.git@zeteo.me>
---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index a6ff68c..25b468e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -44,7 +44,7 @@ then
 	ynh_secure_remove "$install_dir/config.local.php.old"
 fi
 
-ynh_script_progression --message="removing old conf files if exists..." --weight=5
+ynh_script_progression --message="removing old conf files if they exist..." --weight=5
 
 if [ -f "$install_dir/config.local.user.php" ]; then
 	ynh_secure_remove "$install_dir/config.local.user.php"

From c968ab22d365d6c84c120c0294c45d88cc95808b Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Wed, 3 Jan 2024 10:50:57 +0100
Subject: [PATCH 73/80] permissions read only for conf files

---
 scripts/install | 2 +-
 scripts/upgrade | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/install b/scripts/install
index 34521fc..14e57eb 100644
--- a/scripts/install
+++ b/scripts/install
@@ -48,7 +48,7 @@ ynh_script_progression --message="Adding a configuration file..." --weight=5
 # Install configuration files
 ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
 
-chmod 650 "$install_dir/config.local.php"
+chmod 440 "$install_dir/config.local.php"
 chown $app:$app "$install_dir/config.local.php"
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 25b468e..b8c4678 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -38,7 +38,7 @@ then
 	ynh_script_progression --message="cleaning conf files..." --weight=5
 	mv "$install_dir/config.local.php" "$install_dir/config.local.php.old"
 	mv "$install_dir/config.local.yunohost.php" "$install_dir/config.local.php"
-	chmod 650 "$install_dir/config.local.php"
+	chmod 440 "$install_dir/config.local.php"
 	chown $app:$app "$install_dir/config.local.php"
 	ynh_store_file_checksum --file="$install_dir/config.local.php"
 	ynh_secure_remove "$install_dir/config.local.php.old"
@@ -98,7 +98,7 @@ ynh_script_progression --message="Updating a configuration file..." --weight=5
 # Install configuration files
 ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
 
-chmod 650 "$install_dir/config.local.php"
+chmod 440 "$install_dir/config.local.php"
 chown $app:$app "$install_dir/config.local.php"
 
 ynh_replace_string --match_string="//require '$data_dir/data/config.local.user.php';" --replace_string="require '$data_dir/data/config.local.user.php';" --target_file="$install_dir/config.local.php"
@@ -120,7 +120,7 @@ fi
 if [ ! -f "$data_dir/data/config.local.user.php" ]; then
   ynh_script_progression --message="Adding a configuration file..." --weight=5
   ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
-  chmod 650 "$data_dir/data/config.local.user.php"
+  chmod 440 "$data_dir/data/config.local.user.php"
   chown $app:$app "$data_dir/data/config.local.user.php"
 fi
 

From e995390f52c888a2bb145a3ccb40e9c463c29414 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Wed, 3 Jan 2024 11:16:26 +0100
Subject: [PATCH 74/80] try add config file on install

---
 scripts/install | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 14e57eb..ebb5d8d 100644
--- a/scripts/install
+++ b/scripts/install
@@ -43,7 +43,7 @@ chmod 644 "/etc/cron.d/$app"
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
-ynh_script_progression --message="Adding a configuration file..." --weight=5
+ynh_script_progression --message="Adding a configuration files..." --weight=5
 
 # Install configuration files
 ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
@@ -51,6 +51,11 @@ ynh_add_config --template="config.local.php" --destination="$install_dir/config.
 chmod 440 "$install_dir/config.local.php"
 chown $app:$app "$install_dir/config.local.php"
 
+ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
+
+chmod 440 "$data_dir/data/config.local.user.php"
+chown $app:$app "$data_dir/data/config.local.user.php"
+
 #=================================================
 # END OF SCRIPT
 #=================================================

From 96cae50e38ea6260a03f8c17564f11b5f6e2b16c Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Wed, 3 Jan 2024 11:22:38 +0100
Subject: [PATCH 75/80] can't touch /dat-a

---
 scripts/install | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/scripts/install b/scripts/install
index ebb5d8d..6820f82 100644
--- a/scripts/install
+++ b/scripts/install
@@ -51,11 +51,6 @@ ynh_add_config --template="config.local.php" --destination="$install_dir/config.
 chmod 440 "$install_dir/config.local.php"
 chown $app:$app "$install_dir/config.local.php"
 
-ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
-
-chmod 440 "$data_dir/data/config.local.user.php"
-chown $app:$app "$data_dir/data/config.local.user.php"
-
 #=================================================
 # END OF SCRIPT
 #=================================================

From 40987c2d102d6beb301fb9a24a4c701f038f1ea3 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Wed, 3 Jan 2024 11:32:49 +0100
Subject: [PATCH 76/80] add folder data on install and config.local.user.php

---
 scripts/install | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/scripts/install b/scripts/install
index 6820f82..81c8e93 100644
--- a/scripts/install
+++ b/scripts/install
@@ -51,6 +51,16 @@ ynh_add_config --template="config.local.php" --destination="$install_dir/config.
 chmod 440 "$install_dir/config.local.php"
 chown $app:$app "$install_dir/config.local.php"
 
+ynh_script_progression --message="Adding a configuration directory..." --weight=5
+mkdir "$data_dir/data"
+chmod 770 "$data_dir/data"
+chown -R $app:www-data "$data_dir/data"
+
+ynh_script_progression --message="Adding a configuration file..." --weight=5
+ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
+chmod 440 "$data_dir/data/config.local.user.php"
+chown $app:$app "$data_dir/data/config.local.user.php"
+
 #=================================================
 # END OF SCRIPT
 #=================================================

From 955e600fbc56013f023f257df00b73a5406d0b64 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Wed, 3 Jan 2024 11:52:29 +0100
Subject: [PATCH 77/80] more direct

---
 scripts/upgrade | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index b8c4678..31f6959 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -36,12 +36,11 @@ fi
 if [ -f "$install_dir/config.local.yunohost.php" ]
 then
 	ynh_script_progression --message="cleaning conf files..." --weight=5
-	mv "$install_dir/config.local.php" "$install_dir/config.local.php.old"
+	ynh_secure_remove "$install_dir/config.local.php"
 	mv "$install_dir/config.local.yunohost.php" "$install_dir/config.local.php"
 	chmod 440 "$install_dir/config.local.php"
 	chown $app:$app "$install_dir/config.local.php"
 	ynh_store_file_checksum --file="$install_dir/config.local.php"
-	ynh_secure_remove "$install_dir/config.local.php.old"
 fi
 
 ynh_script_progression --message="removing old conf files if they exist..." --weight=5

From a42fd62f0863619a6a3e0283bc468783bebb8682 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Thu, 4 Jan 2024 23:58:25 +0100
Subject: [PATCH 78/80] keep first install without mkdir data and
 config.local.user.php

---
 scripts/install | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scripts/install b/scripts/install
index 81c8e93..6820f82 100644
--- a/scripts/install
+++ b/scripts/install
@@ -51,16 +51,6 @@ ynh_add_config --template="config.local.php" --destination="$install_dir/config.
 chmod 440 "$install_dir/config.local.php"
 chown $app:$app "$install_dir/config.local.php"
 
-ynh_script_progression --message="Adding a configuration directory..." --weight=5
-mkdir "$data_dir/data"
-chmod 770 "$data_dir/data"
-chown -R $app:www-data "$data_dir/data"
-
-ynh_script_progression --message="Adding a configuration file..." --weight=5
-ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
-chmod 440 "$data_dir/data/config.local.user.php"
-chown $app:$app "$data_dir/data/config.local.user.php"
-
 #=================================================
 # END OF SCRIPT
 #=================================================

From 1ad8eb0c68a7bb85bb70d378f7983eec16cf71c8 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Fri, 5 Jan 2024 00:00:46 +0100
Subject: [PATCH 79/80] chmod 640 config.local.user.php

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 31f6959..d652b3d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -119,7 +119,7 @@ fi
 if [ ! -f "$data_dir/data/config.local.user.php" ]; then
   ynh_script_progression --message="Adding a configuration file..." --weight=5
   ynh_add_config --template="config.local.user.php" --destination="$data_dir/data/config.local.user.php"
-  chmod 440 "$data_dir/data/config.local.user.php"
+  chmod 640 "$data_dir/data/config.local.user.php"
   chown $app:$app "$data_dir/data/config.local.user.php"
 fi
 

From 2cae5871ea35fd2812a3d893b893f0ebc84c5991 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Fri, 5 Jan 2024 18:16:14 +0100
Subject: [PATCH 80/80] explanation corrected

---
 conf/config.local.php      | 10 +++++-----
 conf/config.local.user.php |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/conf/config.local.php b/conf/config.local.php
index 18b2068..1dfb6ab 100644
--- a/conf/config.local.php
+++ b/conf/config.local.php
@@ -2,13 +2,13 @@
 
 /**
  * Ce fichier représente un exemple des constantes de configuration
- * disponibles pour Paheko. Il est bâti depuis une copie du fichier __INSTALL_DIR__/config.dist.php
+ * disponibles pour Paheko. Il est bâti depuis une copie du fichier __INSTALL_DIR__/config.dist.php.
  *
- * NE PAS MODIFIER LES VALEURS PRÉSENTES DÉCOMMENTÉES DANS CE FICHIER!
+ * NE PAS MODIFIER CE FICHIER!
  *
- * Pour ajouter des configurations personnelles à votre instance et les garder,
- * lisez attentivement ce fichier, puis ajoutez les constantes commentées nécessaires
- * dans le fichier __DATA_DIR__/data/config.local.user.php.
+ * Pour ajouter des configurations personnelles à votre instance,
+ * ajoutez les constantes commentées voulues dans le fichier __DATA_DIR__/data/config.local.user.php,
+ * éditez-les puis décommentez-les.
  */
 
 // Nécessaire pour situer les constantes dans le bon namespace
diff --git a/conf/config.local.user.php b/conf/config.local.user.php
index 2bc71a6..84f945d 100644
--- a/conf/config.local.user.php
+++ b/conf/config.local.user.php
@@ -3,9 +3,9 @@
 /**
  * Ce fichier est ici pour ajouter des personnalisations à votre configuration.
  *
- * Modifiez ce fichier à votre guise, excepté les constantes déjà éditées dans le fichier
- * __INSTALL_DIR__/config.local.php, il ne sera pas modifié lors des prochaines mises à jour.
+ * Modifiez ce fichier à votre guise, il ne sera pas modifié lors des prochaines mises à jour.
  * Consultez le fichier __INSTALL_DIR__/config.local.php pour choisir des constantes à ajouter.
+ * Pour une nouvelle installation, ce fichier sera pris en compte après la première mise à jour.
  */
 
 // Nécessaire pour situer les constantes dans le bon namespace