From 799587668ba8d57ab579092b76ce2e39c7373257 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Wed, 21 Apr 2021 20:31:39 +0200
Subject: [PATCH 1/5] Update check_process

---
 check_process | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/check_process b/check_process
index b0acafe..1fb0ee9 100644
--- a/check_process
+++ b/check_process
@@ -17,17 +17,17 @@
 		# 3.1.2~ynh3
 		#upgrade=1	from_commit=6b30109fc986d83166b1805ec3ad7e28200e3743
 		# 3.1.2~ynh4
-		upgrade=1	from_commit=d3df899e0a99a63ee1cf7ad845cc513aeaaf30ef
+		#upgrade=1	from_commit=d3df899e0a99a63ee1cf7ad845cc513aeaaf30ef
 		# 3.2.0~ynh1
-		upgrade=1	from_commit=bde14cc4496445fdfed4616ac44fc9527c8369fd
+		#upgrade=1	from_commit=bde14cc4496445fdfed4616ac44fc9527c8369fd
 		# 3.2.1~ynh1
-		upgrade=1	from_commit=248b717f373f3c82bdb19c33cf20980494608697
+		#upgrade=1	from_commit=248b717f373f3c82bdb19c33cf20980494608697
 		# 3.2.1~ynh2
-		upgrade=1	from_commit=74908bf3e70c134bc838c7db3ae8b5aa0938cd75
+		#upgrade=1	from_commit=74908bf3e70c134bc838c7db3ae8b5aa0938cd75
 		# 3.2.2~ynh1
-		upgrade=1	from_commit=a233ccc644d97aa89756fac9f0ce68c98d81d27c
+		#upgrade=1	from_commit=a233ccc644d97aa89756fac9f0ce68c98d81d27c
 		# 3.3.0~ynh1
-		upgrade=1	from_commit=a7eb98db3fac0697b923072dcd78c1ca04bf0a12
+		#upgrade=1	from_commit=a7eb98db3fac0697b923072dcd78c1ca04bf0a12
 		backup_restore=1
 		multi_instance=1
 		port_already_use=0

From e2a23d46f649505a9ece78e1b3e4f0fd73196539 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 23 Apr 2021 13:04:54 +0200
Subject: [PATCH 2/5] Update check_process

---
 check_process | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/check_process b/check_process
index 1fb0ee9..1c35a30 100644
--- a/check_process
+++ b/check_process
@@ -31,7 +31,7 @@
 		backup_restore=1
 		multi_instance=1
 		port_already_use=0
-		change_url=1
+		change_url=0
 ;;; Options
 Email=yalh@yahoo.com
 Notification=all

From eecdd86ba7f958f7d6d78ed9b39f219eaef4121e Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 23 Apr 2021 21:34:19 +0200
Subject: [PATCH 3/5] Update manifest.json

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

diff --git a/manifest.json b/manifest.json
index d6aa9f1..951f3fb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -23,7 +23,7 @@
         }
     ],
     "requirements": {
-        "yunohost": ">= 4.1.3"
+        "yunohost": ">= 4.1.7"
     },
     "multi_instance": true,
     "services": [

From ed49d699acaf02c295f787945993ecef3f759eb6 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Mon, 26 Apr 2021 22:35:12 +0200
Subject: [PATCH 4/5] Fix #267

---
 manifest.json   | 2 +-
 scripts/upgrade | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index 951f3fb..620229a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "A libre and federated social network.",
         "fr": "Un réseau social libre et fédéré."
     },
-    "version": "3.3.0~ynh2",
+    "version": "3.3.0~ynh3",
     "url": "https://github.com/tootsuite/mastodon",
     "license": "AGPL-3.0-or-later",
     "maintainer": {
diff --git a/scripts/upgrade b/scripts/upgrade
index 86555dc..62d576e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -256,8 +256,6 @@ ynh_add_systemd_config --service="$app-streaming" --template="mastodon-streaming
 #=================================================
 ynh_script_progression --message="Upgrading Mastodon..."
 
-chown -R "$app": "$final_path"
-
 pushd "$final_path/live"
 	sudo -u $app $ynh_ruby_load_path bin/bundle config deployment 'true'
 	sudo -u $app $ynh_ruby_load_path bin/bundle config without 'development test'

From 5a60edb5569e7d2bd1f063d891c4cefc6818dbec Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sat, 1 May 2021 14:32:17 +0200
Subject: [PATCH 5/5] fix #237

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

diff --git a/README.md b/README.md
index a4bd460..fdb5158 100644
--- a/README.md
+++ b/README.md
@@ -46,6 +46,10 @@ $ screen -r
 
 `$ sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh --debug `
 
+### Administrate with tooctl
+
+`$ (cd /var/www/mastodon/live && sudo -u mastodon RAILS_ENV=production PATH=/opt/rbenv/versions/mastodon/bin bin/tootctl --help)`
+
 ## Documentation
 
  * Official documentation: https://docs.joinmastodon.org/
diff --git a/README_fr.md b/README_fr.md
index 1f1fc84..3c6dd63 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -47,6 +47,10 @@ L'utilisateur admin est créé automatiquement comme : user@domain.tld
 
 `$ sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh --debug `
 
+### Administration avec tooctl
+
+`$ (cd /var/www/mastodon/live && sudo -u mastodon RAILS_ENV=production PATH=/opt/rbenv/versions/mastodon/bin bin/tootctl --help)`
+
 ## Documentation
 
  * Documentation officielle : https://docs.joinmastodon.org/