Merge pull request #158 from YunoHost-Apps/testing

Testing

6 files changed, 12 insertions, 16 deletions

diff --git a/README.md b/README.md
index 51f388b..5f47cbb 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 ## Overview
 Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust — whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.
 
-**Shipped version:** 2.8.4
+**Shipped version:** 2.9.0
 
 ## Screenshots
 
@@ -54,7 +54,7 @@ The admin user is automatically created as: user@domain.tld
 ### Update
 #### Using __screen__ highly recommended
 
-`$ sudo yunohost app upgrade --debug mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh.git`
+`$ sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh --debug `
 
 ## Recommendation
 
diff --git a/README_fr.md b/README_fr.md
index 5ba8a31..f3e8b46 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -15,7 +15,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 ## Vue d'ensemble
 Mastodon est un réseau social gratuit et open source. Une alternative décentralisée aux plates-formes commerciales, elle évite les risques d'une seule société qui monopolise votre communication. Choisissez un serveur sur lequel vous faites confiance - selon votre choix, vous pouvez interagir avec tous les autres. N'importe qui peut exécuter sa propre instance de Mastodon et participer au réseau social de façon transparente.
 
-**Version incluse:** 2.8.4
+**Version incluse:** 2.9.0
 
 ## Captures d'écran
 
@@ -53,7 +53,7 @@ L'utilisateur admin est crée automatiquement comme: user@domain.tld
 ### Mise à jour
 #### Utilisation de __screen__ fortement recommandé
 
-`$ sudo yunohost app upgrade --debug mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh.git`
+`$ sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh --debug `
 
 ## Recommandations
 
diff --git a/conf/app.src b/conf/app.src
index 095e83b..f99300f 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v2.8.4.tar.gz
-SOURCE_SUM=429d7d46582bd7b070d443207c12811b4ec2fc742a08a154f5a785423cb818bb 
+SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v2.9.0.tar.gz
+SOURCE_SUM=aa67ea9dd378f0e6920b00e354261a6508b19afaa515ea76399abb053f7a4cad 
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 3275bc9..552cf9d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
 		"en": "Mastodon is a free, open-source social network.",
 		"fr": "Mastodon est un réseau social gratuit et open source."
 	},
-	"version": "2.8.4~ynh1",
+	"version": "2.9.0~ynh1",
 	"url": "https://github.com/tootsuite/mastodon",
 	"license": "AGPL-3.0-or-later",
 	"maintainer": [
diff --git a/pull_request_template.md b/pull_request_template.md
index c4fe903..7f09e84 100644
--- a/pull_request_template.md
+++ b/pull_request_template.md
@@ -11,13 +11,8 @@
 - [ ] Upgrade from last version tested.
 - [ ] Can be reviewed and tested.
 
-## Validation
+## Package_check results
 ---
-- [ ] **Code review**
-- [ ] **Approval (LGTM)**  
-*Code review and approval have to be from a member of @YunoHost/apps group*
-- **CI succeeded** : 
-[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/mastodon_ynh%20-BRANCH-/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/mastodon_ynh%20-BRANCH-/)  
-*Please replace '-BRANCH-' in this link by the name of the branch used.*  
-*If the PR is from a forked repository. Please provide public results from package_check.*  
-When the PR is marked as ready to merge, you have to wait for 3 days before really merging it.
+*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results*
+
+[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/mastodon_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/mastodon_ynh%20PR-NUM-%20(USERNAME)/)  
diff --git a/scripts/upgrade b/scripts/upgrade
index 85ca1f1..3dafd21 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -219,6 +219,7 @@ ynh_install_ruby --ruby_version=2.6.1
 #=================================================
 ynh_script_progression --message="Modifying a config file..." --weight=1
 
+ynh_backup_if_checksum_is_different --file="$final_path/live/.env.production"
 cp -f ../conf/.env.production.sample "$final_path/live/.env.production"
 ynh_replace_string --match_string="__DB_USER__" --replace_string="$app" --target_file="$final_path/live/.env.production"
 ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/live/.env.production"