From 55df407594fa61fb8b01eee0a78592e67043b840 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 27 May 2021 09:50:32 +0200
Subject: [PATCH 01/14] Update nginx.conf

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

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 353bc76..d8a1a31 100755
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -7,7 +7,7 @@ location / {
 
   client_max_body_size 50M;
   proxy_pass http://127.0.0.1:__PORT__/;
-  proxy_set_header Connection "";
+  proxy_set_header Connection "upgrade";
   proxy_set_header Host $http_host;
   proxy_set_header X-Real-IP $remote_addr;
   proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

From 7346877026fc5e3d54a519fac70b04502d0b43b0 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 27 May 2021 09:56:59 +0200
Subject: [PATCH 02/14] Update nginx.conf

---
 conf/nginx.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index d8a1a31..946cc01 100755
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -23,8 +23,8 @@ location / {
   proxy_http_version 1.1;
 
   # Include SSOWAT user panel.
-  include conf.d/yunohost_panel.conf.inc;
-  more_clear_input_headers 'Accept-Encoding';
+  #include conf.d/yunohost_panel.conf.inc;
+  #more_clear_input_headers 'Accept-Encoding';
 }
 
 location /ws/ {

From e9ec553bb5943d0cba4e4f790a367833cb220438 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 27 May 2021 10:07:16 +0200
Subject: [PATCH 03/14] Update nginx.conf

---
 conf/nginx.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 946cc01..353bc76 100755
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -7,7 +7,7 @@ location / {
 
   client_max_body_size 50M;
   proxy_pass http://127.0.0.1:__PORT__/;
-  proxy_set_header Connection "upgrade";
+  proxy_set_header Connection "";
   proxy_set_header Host $http_host;
   proxy_set_header X-Real-IP $remote_addr;
   proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -23,8 +23,8 @@ location / {
   proxy_http_version 1.1;
 
   # Include SSOWAT user panel.
-  #include conf.d/yunohost_panel.conf.inc;
-  #more_clear_input_headers 'Accept-Encoding';
+  include conf.d/yunohost_panel.conf.inc;
+  more_clear_input_headers 'Accept-Encoding';
 }
 
 location /ws/ {

From cd06dd106c8fb622c20d57e6943eed2d1780dd08 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 10 Jun 2021 10:04:35 +0200
Subject: [PATCH 04/14] 0.7.0

---
 conf/app.src    | 4 ++--
 conf/nginx.conf | 1 +
 manifest.json   | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index 999c1b4..047aa5a 100755
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/mattermost/focalboard/releases/download/v0.6.7/focalboard-server-linux-amd64.tar.gz
-SOURCE_SUM=df35b7cd51dcdcfaf0e12df40a99dfa9cee579deaa535d6f5597d81ed95bfa4a
+SOURCE_URL=https://github.com/mattermost/focalboard/releases/download/v0.7.0-rc1/focalboard-server-linux-amd64.tar.gz
+SOURCE_SUM=4d47333797fc19917d76fe964a9cfe28d64728488615964f7d8dc95b2e440f08
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 353bc76..aed4866 100755
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -6,6 +6,7 @@ location / {
   }
 
   client_max_body_size 50M;
+  
   proxy_pass http://127.0.0.1:__PORT__/;
   proxy_set_header Connection "";
   proxy_set_header Host $http_host;
diff --git a/manifest.json b/manifest.json
index 1dc2331..e3f7e11 100755
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Self-hosted alternative to Trello, Notion, and Asana",
         "fr": "Alternative auto-hébergée à Trello, Notion et Asana"
     },
-    "version": "0.6.7~ynh1",
+    "version": "0.7.0~ynh1",
     "url": "https://www.focalboard.com/",
     "upstream": {
         "license": "MIT",
@@ -19,7 +19,7 @@
         "name": "John doe"
     },
     "requirements": {
-        "yunohost": ">= 4.1.7"
+        "yunohost": ">= 4.2.4"
     },
     "multi_instance": false,
     "services": [

From 0bf62f5f187ae470a43f29a506cb408d287d0ad3 Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Thu, 10 Jun 2021 08:04:43 +0000
Subject: [PATCH 05/14] Auto-update README

---
 README.md    | 23 ++++++-----------------
 README_fr.md | 33 +++++++++++++--------------------
 2 files changed, 19 insertions(+), 37 deletions(-)

diff --git a/README.md b/README.md
index e9a4032..f77f6c7 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,3 @@
-
-
----
-
 <!--
 N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
 It shall NOT be edited by hand.
@@ -9,38 +5,31 @@ It shall NOT be edited by hand.
 
 # Focalboard for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/focalboard.svg)](https://dash.yunohost.org/appci/app/focalboard) ![](https://ci-apps.yunohost.org/ci/badges/focalboard.status.svg)  ![](https://ci-apps.yunohost.org/ci/badges/focalboard.maintain.svg)
-[![Install focalboard with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=focalboard)
+[![Integration level](https://dash.yunohost.org/integration/focalboard.svg)](https://dash.yunohost.org/appci/app/focalboard) ![](https://ci-apps.yunohost.org/ci/badges/focalboard.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/focalboard.maintain.svg)  
+[![Install Focalboard with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=focalboard)
 
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install focalboard quickly and simply on a YunoHost server.
+> *This package allows you to install Focalboard quickly and simply on a YunoHost server.
 If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Overview
 
 Self-hosted alternative to Trello, Notion, and Asana
 
-**Shipped version:** 0.6.7~ynh1
-
+**Shipped version:** 0.7.0~ynh1
 
 
 
 ## Screenshots
 
-
-   ![](./doc/screenshots/screenshot.jpg)
-
-
-
-
+![](./doc/screenshots/screenshot.jpg)
 
 ## Documentation and resources
 
 * Official app website: https://www.focalboard.com/
-
 * Official admin documentation: https://www.focalboard.com/guide/user/
-* Upstream app code repository:  https://github.com/mattermost/focalboard
+* Upstream app code repository: https://github.com/mattermost/focalboard
 * YunoHost documentation for this app: https://yunohost.org/app_focalboard
 * Report a bug: https://github.com/YunoHost-Apps/focalboard_ynh/issues
 
diff --git a/README_fr.md b/README_fr.md
index cf2a1b7..ce57223 100755
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,40 +1,33 @@
 # Focalboard pour YunoHost
 
-[![Niveau d'intégration](https://dash.yunohost.org/integration/focalboard.svg)](https://dash.yunohost.org/appci/app/focalboard) ![](https://ci-apps.yunohost.org/ci/badges/focalboard.status.svg)  ![](https://ci-apps.yunohost.org/ci/badges/focalboard.maintain.svg)
-[![Installer focalboard avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=focalboard)
+[![Niveau d'intégration](https://dash.yunohost.org/integration/focalboard.svg)](https://dash.yunohost.org/appci/app/focalboard) ![](https://ci-apps.yunohost.org/ci/badges/focalboard.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/focalboard.maintain.svg)  
+[![Installer Focalboard avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=focalboard)
 
 *[Read this readme in english.](./README.md)*
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install focalboard quickly and simply on a YunoHost server.
-If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
+> *Ce package vous permet d'installer Focalboard rapidement et simplement sur un serveur YunoHost.
+Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
 
 ## Vue d'ensemble
 
 Alternative auto-hébergée à Trello, Notion et Asana
 
-**Version incluse:** 0.6.7~ynh1
-
+**Version incluse :** 0.7.0~ynh1
 
 
 
 ## Captures d'écran
 
-
-   ![](./doc/screenshots/screenshot.jpg)
-
-
-
-
+![](./doc/screenshots/screenshot.jpg)
 
 ## Documentations et ressources
 
-* Site official de l'app : https://www.focalboard.com/
-
-* Documentation officielle de l'admin: https://www.focalboard.com/guide/user/
-* Dépôt de code officiel de l'app:  https://github.com/mattermost/focalboard
-* Documentation YunoHost pour cette app: https://yunohost.org/app_focalboard
-* Signaler un bug: https://github.com/YunoHost-Apps/focalboard_ynh/issues
+* Site officiel de l'app : https://www.focalboard.com/
+* Documentation officielle de l'admin : https://www.focalboard.com/guide/user/
+* Dépôt de code officiel de l'app : https://github.com/mattermost/focalboard
+* Documentation YunoHost pour cette app : https://yunohost.org/app_focalboard
+* Signaler un bug : https://github.com/YunoHost-Apps/focalboard_ynh/issues
 
 ## Informations pour les développeurs
 
@@ -43,8 +36,8 @@ Merci de faire vos pull request sur la [branche testing](https://github.com/Yuno
 Pour essayer la branche testing, procédez comme suit.
 ```
 sudo yunohost app install https://github.com/YunoHost-Apps/focalboard_ynh/tree/testing --debug
-or
+ou
 sudo yunohost app upgrade focalboard -u https://github.com/YunoHost-Apps/focalboard_ynh/tree/testing --debug
 ```
 
-**Plus d'infos sur le packaging d'applications:** https://yunohost.org/packaging_apps
\ No newline at end of file
+**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
\ No newline at end of file

From 9b051f78c1d87806d390fc9b6a3b4ba4da7daf72 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 10 Jun 2021 10:50:45 +0200
Subject: [PATCH 06/14] Update nginx.conf

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

diff --git a/conf/nginx.conf b/conf/nginx.conf
index aed4866..2852568 100755
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -8,7 +8,7 @@ location / {
   client_max_body_size 50M;
   
   proxy_pass http://127.0.0.1:__PORT__/;
-  proxy_set_header Connection "";
+  proxy_set_header Connection "upgrade";
   proxy_set_header Host $http_host;
   proxy_set_header X-Real-IP $remote_addr;
   proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

From ca5ac9d3f38798d676bb5a6f452efa6268e428f0 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 10 Jun 2021 11:28:46 +0200
Subject: [PATCH 07/14] Update nginx.conf

---
 conf/nginx.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 2852568..1bace38 100755
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -7,7 +7,7 @@ location / {
 
   client_max_body_size 50M;
   
-  proxy_pass http://127.0.0.1:__PORT__/;
+  proxy_pass http://127.0.0.1:__PORT__;
   proxy_set_header Connection "upgrade";
   proxy_set_header Host $http_host;
   proxy_set_header X-Real-IP $remote_addr;
@@ -28,8 +28,8 @@ location / {
   more_clear_input_headers 'Accept-Encoding';
 }
 
-location /ws/ {
-  proxy_pass http://127.0.0.1:__PORT__/;
+location ~ /ws/ {
+  proxy_pass http://127.0.0.1:__PORT__;
   proxy_set_header Upgrade $http_upgrade;
   proxy_set_header Connection "upgrade";
   client_max_body_size 50M;

From 021f9aa93568bd51ba086c577c6a0ef4144e7dcd Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 10 Jun 2021 11:44:27 +0200
Subject: [PATCH 08/14] Fix

---
 conf/nginx.conf | 40 +++++++++++++++++++-------------------
 scripts/install | 18 ++++++-----------
 scripts/restore | 19 +++++++-----------
 scripts/upgrade | 51 +++++++++++++------------------------------------
 4 files changed, 46 insertions(+), 82 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 1bace38..eaf9881 100755
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,3 +1,23 @@
+location ~ /ws/ {
+  proxy_pass http://127.0.0.1:__PORT__;
+  proxy_set_header Upgrade $http_upgrade;
+  proxy_set_header Connection "upgrade";
+  client_max_body_size 50M;
+  proxy_set_header Host $http_host;
+  proxy_set_header X-Real-IP $remote_addr;
+  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+  proxy_set_header X-Forwarded-Proto $scheme;
+  proxy_set_header X-Frame-Options SAMEORIGIN;
+  proxy_buffers 256 16k;
+  proxy_buffer_size 16k;
+  client_body_timeout 60;
+  send_timeout 300;
+  lingering_timeout 5;
+  proxy_connect_timeout 1d;
+  proxy_send_timeout 1d;
+  proxy_read_timeout 1d;
+}
+
 location / {
 
   # Force usage of https
@@ -28,26 +48,6 @@ location / {
   more_clear_input_headers 'Accept-Encoding';
 }
 
-location ~ /ws/ {
-  proxy_pass http://127.0.0.1:__PORT__;
-  proxy_set_header Upgrade $http_upgrade;
-  proxy_set_header Connection "upgrade";
-  client_max_body_size 50M;
-  proxy_set_header Host $http_host;
-  proxy_set_header X-Real-IP $remote_addr;
-  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-  proxy_set_header X-Forwarded-Proto $scheme;
-  proxy_set_header X-Frame-Options SAMEORIGIN;
-  proxy_buffers 256 16k;
-  proxy_buffer_size 16k;
-  client_body_timeout 60;
-  send_timeout 300;
-  lingering_timeout 5;
-  proxy_connect_timeout 1d;
-  proxy_send_timeout 1d;
-  proxy_read_timeout 1d;
-}
-
 location /uploads/ {
         alias __FILES_PATH__/uploads/ ;
 }
diff --git a/scripts/install b/scripts/install
index 4c0efc9..416b1a9 100755
--- a/scripts/install
+++ b/scripts/install
@@ -94,6 +94,10 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$final_path"
 
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
+
 #=================================================
 # CREATE DIRECTORIES
 #=================================================
@@ -102,6 +106,8 @@ files_path=/home/yunohost.app/$app
 ynh_app_setting_set --app=$app --key=files_path --value=$files_path
 
 mkdir -p $files_path/files
+chown -R $app:$app $files_path
+chmod -R 755 $files_path
 
 #=================================================
 # NGINX CONFIGURATION
@@ -124,18 +130,6 @@ ynh_add_systemd_config
 #=================================================
 
 ynh_add_config --template="../conf/config.json" --destination="$final_path/config.json"
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-
-# Set permissions to app files
-chown -R $app:$app $final_path
-chown -R $app:$app $files_path
-#chmod -R o-rwx $final_path
-chmod -R 755 $files_path
 chmod 600 $final_path/config.json
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 46f856b..fedd8b4 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -53,13 +53,6 @@ test ! -d $final_path \
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# RESTORE THE APP MAIN DIR
-#=================================================
-ynh_script_progression --message="Restoring the app main directory..." --weight=1
-
-ynh_restore_file --origin_path="$final_path"
-
 #=================================================
 # RECREATE THE DEDICATED USER
 #=================================================
@@ -69,13 +62,15 @@ ynh_script_progression --message="Recreating the dedicated system user..." --wei
 ynh_system_user_create --username=$app --home_dir="$final_path"
 
 #=================================================
-# RESTORE USER RIGHTS
+# RESTORE THE APP MAIN DIR
 #=================================================
+ynh_script_progression --message="Restoring the app main directory..." --weight=1
 
-# Restore permissions on app files
-chown -R $app:$app $final_path
-#chmod -R o-rwx $final_path
-chmod 600 $final_path/config.json
+ynh_restore_file --origin_path="$final_path"
+
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
 
 #=================================================
 # SPECIFIC RESTORATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 2101585..ee57837 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -20,7 +20,6 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-files_path=$(ynh_app_setting_get --app=$app --key=files_path)
 port=$(ynh_app_setting_get --app=$app --key=port)
 
 #=================================================
@@ -64,6 +63,14 @@ ynh_script_progression --message="Stopping a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action=stop --log_path="/var/log/$app/$app.log"
 
+#=================================================
+# CREATE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Making sure dedicated system user exists..." --weight=3
+
+# Create a dedicated user (if not existing)
+ynh_system_user_create --username=$app --home_dir="$final_path"
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -71,26 +78,15 @@ ynh_systemd_action --service_name=$app --action=stop --log_path="/var/log/$app/$
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
-
-	# Create a temporary directory
-	tmpdir="$(mktemp -d)"
-
-	# Backup the config file in the temp dir
-	cp -a "$final_path/config.json" "$tmpdir/config.json"
-
-	# Remove the app directory securely
-	ynh_secure_remove --file="$final_path"
 	
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" #--keep="foo bar" to integrate when https://github.com/YunoHost/yunohost/pull/1200 is upstream
-
-	# Copy the admin saved settings from tmp directory to final path	
-	cp -a "$tmpdir/config.json" "$final_path/config.json" 
-
-	# Remove the tmp directory securely
-	ynh_secure_remove --file="$tmpdir"
+	ynh_setup_source --dest_dir="$final_path" --keep="$final_path/config.json"
 fi
 
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -106,14 +102,6 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=2
 
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..." --weight=3
-
-# Create a dedicated user (if not existing)
-ynh_system_user_create --username=$app --home_dir="$final_path"
-
 #=================================================
 # SETUP SYSTEMD
 #=================================================
@@ -122,19 +110,6 @@ ynh_script_progression --message="Upgrading systemd configuration..." --weight=1
 # Create a dedicated systemd config
 ynh_add_systemd_config
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-
-# Set permissions on app files
-chown -R $app:$app $final_path
-chown -R $app:$app $files_path
-#chmod -R o-rwx "$final_path"
-chmod -R 755 $files_path
-chmod 600 $final_path/config.json
-
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================

From 22d4057799207968de0fbdfc2125aed6a8d8aa18 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 15 Jun 2021 22:28:50 +0200
Subject: [PATCH 09/14] Update app.src

---
 conf/app.src | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index 047aa5a..9399bf8 100755
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/mattermost/focalboard/releases/download/v0.7.0-rc1/focalboard-server-linux-amd64.tar.gz
-SOURCE_SUM=4d47333797fc19917d76fe964a9cfe28d64728488615964f7d8dc95b2e440f08
+SOURCE_URL=https://github.com/mattermost/focalboard/releases/download/v0.7.0-rc2/focalboard-server-linux-amd64.tar.gz
+SOURCE_SUM=39e00162517f7b41536d618bfee7223635bce2ce5844f25283b99b26c40a2a80
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

From c1fb1c367d04f69500d778b2cd93e2c9dc7c0853 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 16 Jun 2021 08:21:16 +0200
Subject: [PATCH 10/14] Update upgrade

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

diff --git a/scripts/upgrade b/scripts/upgrade
index ee57837..13aa578 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -21,6 +21,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 port=$(ynh_app_setting_get --app=$app --key=port)
+files_path=$(ynh_app_setting_get --app=$app --key=files_path)
 
 #=================================================
 # CHECK VERSION

From 72b610afed3a43742cc0552317d4d4ac388dcbb7 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 16 Jun 2021 08:21:49 +0200
Subject: [PATCH 11/14] Update change_url

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

diff --git a/scripts/change_url b/scripts/change_url
index 40aad55..012d42d 100755
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -29,6 +29,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
 # Needed for helper "ynh_add_nginx_config"
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 port=$(ynh_app_setting_get --app=$app --key=port)
+files_path=$(ynh_app_setting_get --app=$app --key=files_path)
 
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP

From 00d896490c17371dfb71acd1bf2619fa9a390d38 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 17 Jun 2021 19:08:39 +0200
Subject: [PATCH 12/14] Update app.src

---
 conf/app.src | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/app.src b/conf/app.src
index 9399bf8..9ba12c3 100755
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,4 +1,4 @@
-SOURCE_URL=https://github.com/mattermost/focalboard/releases/download/v0.7.0-rc2/focalboard-server-linux-amd64.tar.gz
+SOURCE_URL=https://github.com/mattermost/focalboard/releases/download/v0.7.0/focalboard-server-linux-amd64.tar.gz
 SOURCE_SUM=39e00162517f7b41536d618bfee7223635bce2ce5844f25283b99b26c40a2a80
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz

From 62412d3980b2e1ebec633c26c6b374483349daa9 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 17 Jun 2021 23:35:50 +0200
Subject: [PATCH 13/14] fix

---
 scripts/_common.sh | 1 +
 scripts/backup     | 2 ++
 scripts/install    | 2 +-
 scripts/restore    | 6 ++++++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index de1680d..c0220ac 100755
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -3,6 +3,7 @@
 #=================================================
 # COMMON VARIABLES
 #=================================================
+
 # dependencies used by the app
 pkg_dependencies="postgresql postgresql-contrib"
 
diff --git a/scripts/backup b/scripts/backup
index 199209a..17b62df 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -29,6 +29,7 @@ ynh_print_info --message="Loading installation settings..."
 app=$YNH_APP_INSTANCE_NAME
 
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+files_path=$(ynh_app_setting_get --app=$app --key=files_path)
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 
@@ -42,6 +43,7 @@ ynh_print_info --message="Declaring files to be backed up..."
 #=================================================
 
 ynh_backup --src_path="$final_path"
+ynh_backup --src_path="$files_path"
 
 #=================================================
 # BACKUP THE NGINX CONFIGURATION
diff --git a/scripts/install b/scripts/install
index 416b1a9..7c24650 100755
--- a/scripts/install
+++ b/scripts/install
@@ -106,7 +106,7 @@ files_path=/home/yunohost.app/$app
 ynh_app_setting_set --app=$app --key=files_path --value=$files_path
 
 mkdir -p $files_path/files
-chown -R $app:$app $files_path
+chown -R $app:www-data $files_path
 chmod -R 755 $files_path
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index fedd8b4..911fcf5 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -31,6 +31,7 @@ app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+files_path=$(ynh_app_setting_get --app=$app --key=files_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
 db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
@@ -72,6 +73,11 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
+ynh_restore_file --origin_path="$files_path"
+
+chown -R $app:www-data $files_path
+chmod -R 755 $files_path
+
 #=================================================
 # SPECIFIC RESTORATION
 #=================================================

From 35900c94eb293696c8617722a80deacfbd914ae5 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 19 Jun 2021 23:10:54 +0200
Subject: [PATCH 14/14] Update upgrade

---
 scripts/upgrade | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 13aa578..54c58f0 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -80,8 +80,22 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 	
+	# Create a temporary directory
+	tmpdir="$(mktemp -d)"
+
+	# Backup the config file in the temp dir
+	cp -a "$final_path/config.json" "$tmpdir/config.json"
+
+	# Remove the app directory securely
+	ynh_secure_remove --file="$final_path"
+
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --keep="$final_path/config.json"
+	ynh_setup_source --dest_dir="$final_path" #--keep="$final_path/config.json"
+	# Copy the admin saved settings from tmp directory to final path	
+	cp -a "$tmpdir/config.json" "$final_path/config.json" 
+
+	# Remove the tmp directory securely
+	ynh_secure_remove --file="$tmpdir"
 fi
 
 chmod 750 "$final_path"