From 2c16dcb7ebba7f0a796154348bd9a10f23c1c59e Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 12 Jan 2020 22:07:42 +0100
Subject: [PATCH 01/15] Upgrade to 1.1.8

---
 README.md       | 2 +-
 conf/arm.src    | 6 +++---
 conf/arm64.src  | 6 +++---
 conf/x86-64.src | 6 +++---
 manifest.json   | 2 +-
 scripts/install | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 22bd18d..713be60 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ For user friendly details about Pleroma: [see here](https://blog.soykaf.com/post
 - Tootdon (Android + iOS)
 - Tootle (iOS)
 
-**Shipped version:** 1.1.7
+**Shipped version:** 1.1.8
 
 ## Important points to read before installing
 
diff --git a/conf/arm.src b/conf/arm.src
index fae8824..e9eb4d0 100644
--- a/conf/arm.src
+++ b/conf/arm.src
@@ -1,6 +1,6 @@
-SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/84826/artifacts/download
-SOURCE_SUM=aeb527340dbecc5056cd3aca459ed0a0f3b41808afc492e61f998032e5c3d874
+SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/87650/artifacts/download
+SOURCE_SUM=2b1ccfcd23e096bd9be1333a5c048e3e2ae122a0f2ad7fd772d52ed2424c9f84
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=pleroma-v1.1.7-arm.zip
+SOURCE_FILENAME=pleroma-v1.1.8-arm.zip
diff --git a/conf/arm64.src b/conf/arm64.src
index f827990..4bcfc9c 100644
--- a/conf/arm64.src
+++ b/conf/arm64.src
@@ -1,6 +1,6 @@
-SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/84828/artifacts/download
-SOURCE_SUM=74032e08b6f89321eb5545ff77fb0b1f142cba49c691d69316963d296d16b727
+SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/87652/artifacts/download
+SOURCE_SUM=16c6f229a42777c4bda3a81ef21b1a42bb3e935ff1bdf25020907ca3a6c27da3
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=pleroma-v1.1.7-arm64.zip
+SOURCE_FILENAME=pleroma-v1.1.8-arm64.zip
diff --git a/conf/x86-64.src b/conf/x86-64.src
index 4cf360d..25d9d6b 100644
--- a/conf/x86-64.src
+++ b/conf/x86-64.src
@@ -1,6 +1,6 @@
-SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/84824/artifacts/download
-SOURCE_SUM=6cd69e80894af966bb88505dae572e197c96da02ba980357a606bcc948a78e36
+SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/87648/artifacts/download
+SOURCE_SUM=cea7bfc9513b806e8cf9f1cd4ce2daf2216e1fa54b51b8984726c64279b6f0af
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=pleroma-v1.1.7-x86-64.zip
+SOURCE_FILENAME=pleroma-v1.1.8-x86-64.zip
diff --git a/manifest.json b/manifest.json
index d247b31..c335ae7 100755
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Pleroma is an OStatus-compatible social networking server written in Elixir, compatible with GNU Social and Mastodon",
         "fr": "Pleroma est un réseau social écrit en Elixir, compatible avec OStatus, GNU Social et Mastodon"
     },
-    "version": "1.1.7~ynh1",
+    "version": "1.1.8~ynh1",
     "url": "https://git.pleroma.social/pleroma/pleroma",
     "license": "AGPL-3.0-only",
     "maintainer": [
diff --git a/scripts/install b/scripts/install
index e443567..8ea55c9 100755
--- a/scripts/install
+++ b/scripts/install
@@ -193,7 +193,7 @@ chown -R "$app":"$app" "$final_path"
 
 pushd $final_path/$app
     #Workaround for static-dir error
-    ynh_replace_string --match_string="_dir" --replace_string="" --target_file="/var/www/pleroma/pleroma/releases/1.1.7/releases.exs"
+    ynh_replace_string --match_string="_dir" --replace_string="" --target_file="/var/www/pleroma/pleroma/releases/1.1.8/releases.exs"
     
     #Generate instance
     su "$app" -s $SHELL -lc "$final_path/$app/bin/pleroma_ctl instance gen --force \

From f6922e83e58f96b6af5d37bb49c56624631a23be Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 12 Jan 2020 22:35:07 +0100
Subject: [PATCH 02/15] Update upgrade

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

diff --git a/scripts/upgrade b/scripts/upgrade
index 1d22f2e..32b7bdd 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -110,7 +110,6 @@ ynh_print_info --message="Backing up the app before upgrading (may take a while)
 # Backup the current version of the app
 ynh_backup_before_upgrade
 ynh_clean_setup () {
-	read -p "key"
 	# restore it if the upgrade fails
 	ynh_restore_upgradebackup
 	ynh_clean_check_starting

From c8b8cd0ea3847be381e523542d165c1421572a17 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Mon, 13 Jan 2020 00:33:37 +0100
Subject: [PATCH 03/15] Applying example_ynh

---
 scripts/change_url |  9 ++++++---
 scripts/install    |  8 ++++++--
 scripts/remove     |  7 ++++---
 scripts/restore    |  4 +++-
 scripts/upgrade    | 10 ++++++----
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/scripts/change_url b/scripts/change_url
index 65d9cfb..cb7b73d 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -110,16 +110,19 @@ fi
 #=================================================
 # MODIFY A CONFIG FILE
 #=================================================
+ynh_print_info --message="Modifying a config file..."
 
-ynh_replace_string --match_string="$old_domain" --replace_string="$new_domain" --target_file="$final_path/$app/config/prod.secret.exs"
+config="/etc/$app/config.exs"
+ynh_backup_if_checksum_is_different --file="$config"
+ynh_replace_string --match_string="$old_domain" --replace_string="$new_domain" --target_file="$config"
 
 #=================================================
 # STORE THE CONFIG FILE CHECKSUM
 #=================================================
+ynh_print_info --message="Storing the config file checksum..."
 
-ynh_backup_if_checksum_is_different --file="$final_path/$app/config/prod.secret.exs"
 # Recalculate and store the checksum of the file for the next upgrade.
-ynh_store_file_checksum --file="$final_path/$app/config/prod.secret.exs"
+ynh_store_file_checksum --file="$config"
 
 #=================================================
 # GENERIC FINALISATION
diff --git a/scripts/install b/scripts/install
index e443567..208d186 100755
--- a/scripts/install
+++ b/scripts/install
@@ -126,6 +126,7 @@ ynh_print_info --message="Configuring nginx web server..."
 
 # Create a dedicated nginx config
 ynh_add_nginx_config
+
 if [ $cache -eq 1 ]
 then
 	cp -rf "../conf/cache.conf" "/etc/nginx/conf.d/$app-cache.conf"
@@ -151,7 +152,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
 #=================================================
 # CREATE THE DATA DIRECTORY
 #=================================================
-ynh_print_info --message="Create the data directory..."
+ynh_print_info --message="Creating the data directory..."
 
 # Define app's data directory
 datadir="/home/yunohost.app/${app}"
@@ -168,8 +169,9 @@ chown -R "$app":"$app" "$datadir"
 ynh_app_setting_set --app=$app --key=datadir --value="$datadir"
 
 #=================================================
-# MODIFY A CONFIG FILE
+# CREATE THE CONFIG DIRECTORY
 #=================================================
+ynh_print_info --message="Creating the config directory..."
 
 mkdir -p /etc/$app
 chown -R $app /etc/$app
@@ -187,6 +189,7 @@ ynh_add_systemd_config
 #=================================================
 # MAKE SETUP
 #=================================================
+ynh_print_info --message="Making setup..."
 
 # Give permission to the final_path
 chown -R "$app":"$app" "$final_path"
@@ -226,6 +229,7 @@ popd
 #=================================================
 # STORE THE CONFIG FILE CHECKSUM
 #=================================================
+ynh_print_info --message="Storing the config file checksum..."
 
 # Calculate and store the config file checksum into the app settings
 ynh_store_file_checksum --file="$config"
diff --git a/scripts/remove b/scripts/remove
index 18ffb57..4a5eb45 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -88,7 +88,7 @@ ynh_secure_remove --file="/etc/nginx/conf.d/$app-cache.conf"
 #=================================================
 # CLOSE A PORT
 #=================================================
-ynh_print_info --message="Closing a port"
+ynh_print_info --message="Closing a port..."
 
 if yunohost firewall list | grep -q "\- $port$"
 then
@@ -101,12 +101,13 @@ fi
 #=================================================
 # REMOVE DIRECTORIES
 #=================================================
+ynh_print_info --message="Removing directories..."
 
 # Remove the config directory securely
-ynh_secure_remove "/etc/$app/"
+ynh_secure_remove --file="/etc/$app"
 
 # Remove the data directory securely
-ynh_secure_remove "$datadir/"
+ynh_secure_remove --file="$datadir"
 
 #=================================================
 # GENERIC FINALIZATION
diff --git a/scripts/restore b/scripts/restore
index f7149f3..d9babf8 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -53,8 +53,10 @@ test ! -d $final_path \
 #=================================================
 # RESTORE THE NGINX CONFIGURATION
 #=================================================
+ynh_print_info --message="Restoring the nginx configuration..."
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+
 if [ $cache -eq 1 ]
 then
 	ynh_restore_file --origin_path="/etc/nginx/conf.d/$app-cache.conf"
@@ -88,7 +90,7 @@ chown -R "$app":"$app" "$final_path"
 #=================================================
 # RECREATE THE DATA DIRECTORY
 #=================================================
-ynh_print_info --message="Recreate the data directory..."
+ynh_print_info --message="Recreating the data directory..."
 
 # Create app folders
 mkdir -p "$datadir/"
diff --git a/scripts/upgrade b/scripts/upgrade
index 32b7bdd..c6563fb 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -37,6 +37,7 @@ registration=$(ynh_app_setting_get --app=$app --key=registration)
 #=================================================
 # CHECK VERSION
 #=================================================
+ynh_print_info --message="Checking version..."
 
 upgrade_type=$(ynh_check_app_version_changed)
 
@@ -94,6 +95,7 @@ apt-key del A14F4FCA
 #=================================================
 # CHECK VERSION NUMBER
 #=================================================
+ynh_print_info --message="Checking version number..."
 
 if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
   sleep 60
@@ -110,9 +112,9 @@ ynh_print_info --message="Backing up the app before upgrading (may take a while)
 # Backup the current version of the app
 ynh_backup_before_upgrade
 ynh_clean_setup () {
+	ynh_clean_check_starting
 	# restore it if the upgrade fails
 	ynh_restore_upgradebackup
-	ynh_clean_check_starting
 }
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
@@ -129,9 +131,10 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line
 #=================================================
 # UPGRADE TO OTP RELEASE
 #=================================================
-ynh_print_info --message="Upgrading to OTP release..."
 
 if ynh_version_gt "1.1.1~ynh1" "${previous_version}" ; then
+	ynh_print_info --message="Upgrading to OTP release..."
+
 	# Define app's data directory
 	datadir="/home/yunohost.app/${app}"
 	ynh_app_setting_set --app=$app --key=datadir --value="$datadir"
@@ -161,13 +164,12 @@ if ynh_version_gt "1.1.1~ynh1" "${previous_version}" ; then
 
 	ynh_backup_if_checksum_is_different --file="$config"
 
-	rm -r $final_path/$app/*
+	ynh_secure_remove --file="$final_path/$app"
 fi
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
-ynh_print_info --message="Upgrading source files..."
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then

From 2ec9c6e00ac6b7bc12b75336a4cb9a10d6336ebf Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 17 Jan 2020 01:04:29 +0100
Subject: [PATCH 04/15] Update check_process

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

diff --git a/check_process b/check_process
index 491412f..b5be385 100755
--- a/check_process
+++ b/check_process
@@ -21,7 +21,8 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		upgrade=1	from_commit=edf199768f57000f4df6e2c704483e1036a78203
+		upgrade=1	from_commit=9ec87c36793780f74365d3059d7b9d12885fbfcb #0.9.99999
+		upgrade=1	from_commit=3e88dd59d8e5593fb60a86ab955aafde76abdf2e #1.1.7
 		backup_restore=1
 		multi_instance=0
 		# This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version.

From 717f749c11cfaed4df9b9064f0ad0b61f2758e23 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 17 Jan 2020 19:46:34 +0100
Subject: [PATCH 05/15] removing version

---
 check_process | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/check_process b/check_process
index b5be385..6b87736 100755
--- a/check_process
+++ b/check_process
@@ -21,8 +21,8 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		upgrade=1	from_commit=9ec87c36793780f74365d3059d7b9d12885fbfcb #0.9.99999
-		upgrade=1	from_commit=3e88dd59d8e5593fb60a86ab955aafde76abdf2e #1.1.7
+		upgrade=1	from_commit=9ec87c36793780f74365d3059d7b9d12885fbfcb
+		upgrade=1	from_commit=3e88dd59d8e5593fb60a86ab955aafde76abdf2e
 		backup_restore=1
 		multi_instance=0
 		# This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version.

From d4465eca702ddbb21a615d151e40ca995e96977f Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 17 Jan 2020 19:59:03 +0100
Subject: [PATCH 06/15] removing # Download the new release

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

diff --git a/scripts/upgrade b/scripts/upgrade
index c6563fb..a0ca31b 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -236,7 +236,6 @@ ynh_print_info --message="Making upgrade..."
 chown -R "$app":"$app" "$final_path"
 
 pushd $final_path/$app
-    su "$app" -s $SHELL -lc "$final_path/$app/bin/pleroma_ctl update"
     su "$app" -s $SHELL -lc "$final_path/$app/bin/pleroma_ctl migrate"
 popd
 

From 59a58ea63596627282ea733a80c9e7bce39ca9bf Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 17 Jan 2020 20:48:23 +0100
Subject: [PATCH 07/15] fixing pleroma service stop

---
 scripts/backup     | 2 +-
 scripts/change_url | 2 +-
 scripts/upgrade    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/backup b/scripts/backup
index bdc445c..09b8cfa 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -41,7 +41,7 @@ cache=$(ynh_app_setting_get --app=$app --key=cache)
 #=================================================
 ynh_print_info --message="Stopping a systemd service..."
 
-ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped $app"
+pkill -u $app
 
 #=================================================
 # BACKUP THE APP MAIN DIR
diff --git a/scripts/change_url b/scripts/change_url
index cb7b73d..a4bfc76 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -74,7 +74,7 @@ fi
 #=================================================
 ynh_print_info --message="Stopping a systemd service..."
 
-ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped $app"
+pkill -u $app
 
 #=================================================
 # MODIFY URL IN NGINX CONF
diff --git a/scripts/upgrade b/scripts/upgrade
index a0ca31b..e4d2324 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -126,7 +126,7 @@ ynh_abort_if_errors
 #=================================================
 ynh_print_info --message="Stopping a systemd service..."
 
-ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped $app"
+pkill -u $app
 
 #=================================================
 # UPGRADE TO OTP RELEASE

From 7b59f5cd954cf81c89b99a10a0421e7f5d563f1c Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 19 Jan 2020 14:54:25 +0100
Subject: [PATCH 08/15] Fix upgrade

---
 scripts/backup     | 1 +
 scripts/change_url | 1 +
 scripts/remove     | 1 +
 scripts/upgrade    | 1 +
 4 files changed, 4 insertions(+)

diff --git a/scripts/backup b/scripts/backup
index 09b8cfa..1320ef3 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -41,6 +41,7 @@ cache=$(ynh_app_setting_get --app=$app --key=cache)
 #=================================================
 ynh_print_info --message="Stopping a systemd service..."
 
+ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped $app"
 pkill -u $app
 
 #=================================================
diff --git a/scripts/change_url b/scripts/change_url
index a4bfc76..9748c26 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -74,6 +74,7 @@ fi
 #=================================================
 ynh_print_info --message="Stopping a systemd service..."
 
+ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped $app"
 pkill -u $app
 
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index 4a5eb45..287217f 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -42,6 +42,7 @@ fi
 #=================================================
 ynh_print_info --message="Stopping all pleroma services..."
 
+ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped $app"
 pkill -u $app
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index e4d2324..c740bb5 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -126,6 +126,7 @@ ynh_abort_if_errors
 #=================================================
 ynh_print_info --message="Stopping a systemd service..."
 
+ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped $app"
 pkill -u $app
 
 #=================================================

From a8a048680112134019d1053bbb72b9925da8c6a9 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 19 Jan 2020 16:38:14 +0100
Subject: [PATCH 09/15] Adding spacing

---
 scripts/backup     | 1 +
 scripts/change_url | 1 +
 scripts/remove     | 1 +
 scripts/upgrade    | 1 +
 4 files changed, 4 insertions(+)

diff --git a/scripts/backup b/scripts/backup
index 1320ef3..ceaafea 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -42,6 +42,7 @@ cache=$(ynh_app_setting_get --app=$app --key=cache)
 ynh_print_info --message="Stopping a systemd service..."
 
 ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped $app"
+
 pkill -u $app
 
 #=================================================
diff --git a/scripts/change_url b/scripts/change_url
index 9748c26..1732b01 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -75,6 +75,7 @@ fi
 ynh_print_info --message="Stopping a systemd service..."
 
 ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped $app"
+
 pkill -u $app
 
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index 287217f..e30f44e 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -43,6 +43,7 @@ fi
 ynh_print_info --message="Stopping all pleroma services..."
 
 ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped $app"
+
 pkill -u $app
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index c740bb5..dbdf6cb 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -127,6 +127,7 @@ ynh_abort_if_errors
 ynh_print_info --message="Stopping a systemd service..."
 
 ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped $app"
+
 pkill -u $app
 
 #=================================================

From a03e0a81248bb4b016f48ce5844b66dfe77b1c05 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 19 Jan 2020 23:05:19 +0100
Subject: [PATCH 10/15] fix stop for previous version

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

diff --git a/scripts/upgrade b/scripts/upgrade
index dbdf6cb..de82a8c 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -128,7 +128,9 @@ ynh_print_info --message="Stopping a systemd service..."
 
 ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped $app"
 
-pkill -u $app
+if ynh_version_gt "1.1.7~ynh1" "${previous_version}" ; then
+	pkill -u $app
+fi
 
 #=================================================
 # UPGRADE TO OTP RELEASE

From ef784ee711f5fe0a05852736b8ebef2430d43d3f Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Mon, 20 Jan 2020 01:12:57 +0100
Subject: [PATCH 11/15] Fix upgrade from OTPs versions

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

diff --git a/scripts/upgrade b/scripts/upgrade
index de82a8c..3aeca67 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -128,7 +128,7 @@ ynh_print_info --message="Stopping a systemd service..."
 
 ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped $app"
 
-if ynh_version_gt "1.1.7~ynh1" "${previous_version}" ; then
+if ynh_version_gt "${previous_version}" "1.1.1~ynh1"  ; then
 	pkill -u $app
 fi
 

From 79ddbcc87dd71268a8a29d2af39105720c704683 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 9 Feb 2020 18:17:11 +0100
Subject: [PATCH 12/15] Upgrade to 1.1.9

---
 README.md       | 2 +-
 conf/arm.src    | 6 +++---
 conf/arm64.src  | 6 +++---
 conf/x86-64.src | 6 +++---
 manifest.json   | 2 +-
 scripts/install | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 713be60..58ea01e 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ For user friendly details about Pleroma: [see here](https://blog.soykaf.com/post
 - Tootdon (Android + iOS)
 - Tootle (iOS)
 
-**Shipped version:** 1.1.8
+**Shipped version:** 1.1.9
 
 ## Important points to read before installing
 
diff --git a/conf/arm.src b/conf/arm.src
index e9eb4d0..a6cd82f 100644
--- a/conf/arm.src
+++ b/conf/arm.src
@@ -1,6 +1,6 @@
-SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/87650/artifacts/download
-SOURCE_SUM=2b1ccfcd23e096bd9be1333a5c048e3e2ae122a0f2ad7fd772d52ed2424c9f84
+SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/94058/artifacts/download
+SOURCE_SUM=cc0f4af2cc5f87536a1049f45dbfb7ee38d19bbbf9a16aae08cf350b7936a8b4
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=pleroma-v1.1.8-arm.zip
+SOURCE_FILENAME=pleroma-v1.1.9-arm.zip
diff --git a/conf/arm64.src b/conf/arm64.src
index 4bcfc9c..7822791 100644
--- a/conf/arm64.src
+++ b/conf/arm64.src
@@ -1,6 +1,6 @@
-SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/87652/artifacts/download
-SOURCE_SUM=16c6f229a42777c4bda3a81ef21b1a42bb3e935ff1bdf25020907ca3a6c27da3
+SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/94060/artifacts/download
+SOURCE_SUM=2134613e3f6b2ab0a1b14279a682aaed1aec7cdcd4121d35ebec9f50edd08d30
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=pleroma-v1.1.8-arm64.zip
+SOURCE_FILENAME=pleroma-v1.1.9-arm64.zip
diff --git a/conf/x86-64.src b/conf/x86-64.src
index 25d9d6b..a5a0fba 100644
--- a/conf/x86-64.src
+++ b/conf/x86-64.src
@@ -1,6 +1,6 @@
-SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/87648/artifacts/download
-SOURCE_SUM=cea7bfc9513b806e8cf9f1cd4ce2daf2216e1fa54b51b8984726c64279b6f0af
+SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/94056/artifacts/download
+SOURCE_SUM=5f9b4ce809885b9ba45702aa1bb8de142a86be3a1913b089de7ea2a7a330af29
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=pleroma-v1.1.8-x86-64.zip
+SOURCE_FILENAME=pleroma-v1.1.9-x86-64.zip
diff --git a/manifest.json b/manifest.json
index c335ae7..0568a2b 100755
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Pleroma is an OStatus-compatible social networking server written in Elixir, compatible with GNU Social and Mastodon",
         "fr": "Pleroma est un réseau social écrit en Elixir, compatible avec OStatus, GNU Social et Mastodon"
     },
-    "version": "1.1.8~ynh1",
+    "version": "1.1.9~ynh1",
     "url": "https://git.pleroma.social/pleroma/pleroma",
     "license": "AGPL-3.0-only",
     "maintainer": [
diff --git a/scripts/install b/scripts/install
index 40c6d42..0f2520a 100755
--- a/scripts/install
+++ b/scripts/install
@@ -196,7 +196,7 @@ chown -R "$app":"$app" "$final_path"
 
 pushd $final_path/$app
     #Workaround for static-dir error
-    ynh_replace_string --match_string="_dir" --replace_string="" --target_file="/var/www/pleroma/pleroma/releases/1.1.8/releases.exs"
+    ynh_replace_string --match_string="_dir" --replace_string="" --target_file="/var/www/pleroma/pleroma/releases/1.1.9/releases.exs"
     
     #Generate instance
     su "$app" -s $SHELL -lc "$final_path/$app/bin/pleroma_ctl instance gen --force \

From 5f8f06ace8ea71078bf98be05d93ce4f302bbd3b Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 9 Feb 2020 21:30:27 +0100
Subject: [PATCH 13/15] Update check_process

---
 check_process | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/check_process b/check_process
index 6b87736..2d33963 100755
--- a/check_process
+++ b/check_process
@@ -21,8 +21,12 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
+		# 0.9.99999
 		upgrade=1	from_commit=9ec87c36793780f74365d3059d7b9d12885fbfcb
+		# 1.1.7
 		upgrade=1	from_commit=3e88dd59d8e5593fb60a86ab955aafde76abdf2e
+		# 1.1.8
+		upgrade=1	from_commit=0a839da33898b7a58f12a27b5b51799694021353
 		backup_restore=1
 		multi_instance=0
 		# This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version.

From 0693dd5efd5ab2a06267993cc7106ed2efc26ea2 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Wed, 11 Mar 2020 00:31:19 +0100
Subject: [PATCH 14/15] Upgrade to 2.0.0

---
 README.md       | 2 +-
 conf/arm.src    | 6 +++---
 conf/arm64.src  | 6 +++---
 conf/x86-64.src | 6 +++---
 manifest.json   | 2 +-
 scripts/install | 6 ++----
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 58ea01e..1beaeb8 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ For user friendly details about Pleroma: [see here](https://blog.soykaf.com/post
 - Tootdon (Android + iOS)
 - Tootle (iOS)
 
-**Shipped version:** 1.1.9
+**Shipped version:** 2.0.0
 
 ## Important points to read before installing
 
diff --git a/conf/arm.src b/conf/arm.src
index a6cd82f..5bfdee4 100644
--- a/conf/arm.src
+++ b/conf/arm.src
@@ -1,6 +1,6 @@
-SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/94058/artifacts/download
-SOURCE_SUM=cc0f4af2cc5f87536a1049f45dbfb7ee38d19bbbf9a16aae08cf350b7936a8b4
+SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/100179/artifacts/download
+SOURCE_SUM=ed4256dd42f6dcabbf61f92e8238a20c83802356f7da44ff80b5d1cf209d3292
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=pleroma-v1.1.9-arm.zip
+SOURCE_FILENAME=pleroma-v2.0.0-arm.zip
diff --git a/conf/arm64.src b/conf/arm64.src
index 7822791..0164b02 100644
--- a/conf/arm64.src
+++ b/conf/arm64.src
@@ -1,6 +1,6 @@
-SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/94060/artifacts/download
-SOURCE_SUM=2134613e3f6b2ab0a1b14279a682aaed1aec7cdcd4121d35ebec9f50edd08d30
+SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/100181/artifacts/download
+SOURCE_SUM=aa0cfdc2634eb8f9e8ef26bcf01ba8280f41373138b8f14fd5129815cbf76c02
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=pleroma-v1.1.9-arm64.zip
+SOURCE_FILENAME=pleroma-v2.0.0-arm64.zip
diff --git a/conf/x86-64.src b/conf/x86-64.src
index a5a0fba..71990de 100644
--- a/conf/x86-64.src
+++ b/conf/x86-64.src
@@ -1,6 +1,6 @@
-SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/94056/artifacts/download
-SOURCE_SUM=5f9b4ce809885b9ba45702aa1bb8de142a86be3a1913b089de7ea2a7a330af29
+SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/100177/artifacts/download
+SOURCE_SUM=daada8893d8afa515c4c50967d411d39186632d540851ff9e8581ffef02b417c
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=pleroma-v1.1.9-x86-64.zip
+SOURCE_FILENAME=pleroma-v2.0.0-x86-64.zip
diff --git a/manifest.json b/manifest.json
index 0568a2b..4dfa32f 100755
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Pleroma is an OStatus-compatible social networking server written in Elixir, compatible with GNU Social and Mastodon",
         "fr": "Pleroma est un réseau social écrit en Elixir, compatible avec OStatus, GNU Social et Mastodon"
     },
-    "version": "1.1.9~ynh1",
+    "version": "2.0.0~ynh1",
     "url": "https://git.pleroma.social/pleroma/pleroma",
     "license": "AGPL-3.0-only",
     "maintainer": [
diff --git a/scripts/install b/scripts/install
index 0f2520a..77533ef 100755
--- a/scripts/install
+++ b/scripts/install
@@ -195,9 +195,6 @@ ynh_print_info --message="Making setup..."
 chown -R "$app":"$app" "$final_path"
 
 pushd $final_path/$app
-    #Workaround for static-dir error
-    ynh_replace_string --match_string="_dir" --replace_string="" --target_file="/var/www/pleroma/pleroma/releases/1.1.9/releases.exs"
-    
     #Generate instance
     su "$app" -s $SHELL -lc "$final_path/$app/bin/pleroma_ctl instance gen --force \
     --output $config \
@@ -215,7 +212,8 @@ pushd $final_path/$app
     --uploads-dir $datadir/uploads \
     --static-dir $datadir/static \
     --listen-ip 127.0.0.1 \
-    --listen-port $port"
+    --listen-port $port \
+    --db-configurable Y"
 
     su "$app" -s $SHELL -lc "$final_path/$app/bin/pleroma_ctl migrate"
 

From bb7b5abdb0a9c74e8365c974da8d064f52d74d90 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Wed, 11 Mar 2020 20:55:30 +0100
Subject: [PATCH 15/15] Update check_process

---
 check_process | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/check_process b/check_process
index 2d33963..cb9a758 100755
--- a/check_process
+++ b/check_process
@@ -27,6 +27,8 @@
 		upgrade=1	from_commit=3e88dd59d8e5593fb60a86ab955aafde76abdf2e
 		# 1.1.8
 		upgrade=1	from_commit=0a839da33898b7a58f12a27b5b51799694021353
+		# 1.1.9
+		upgrade=1	from_commit=eedad6977760c31d7fb94ced247b9136824da580
 		backup_restore=1
 		multi_instance=0
 		# This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version.