From c9fc906dccbab7668a14d75dfdab4a8c23079aea Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Thu, 3 Dec 2020 19:30:24 +0100
Subject: [PATCH 1/2] Upgrade to upstream version 2.6.0
---
README.md | 2 +-
conf/app.src | 4 ++--
manifest.json | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 95c78a0..8dfa159 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ Finally, if installing on a low-end ARM device (e.g. Raspberry Pi):
To learn more about the philosophy and goals of the project, [visit **discourse.org**](http://www.discourse.org).
-**Shipped version:** 2.5.5
+**Shipped version:** 2.6.0
## Screenshots
diff --git a/conf/app.src b/conf/app.src
index d5646e9..f10460c 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/discourse/discourse/archive/v2.5.5.tar.gz
-SOURCE_SUM=22086033c797eaaa984c50f2256ceb7b7c45e5951191c5399d1a4e10fb201319
+SOURCE_URL=https://github.com/discourse/discourse/archive/v2.6.0.tar.gz
+SOURCE_SUM=29b35fe3f8c7e8957dc1fdc54b3cf6668b51d9a886ceabe0e6b83ba4b64b2f8e
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 759d607..5b8365b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
"en": "Discussion platform",
"fr": "Plateforme de discussion"
},
- "version": "2.5.5~ynh1",
+ "version": "2.6.0~ynh1",
"url": "http://Discourse.org",
"license": "GPL-2.0",
"maintainer": {
From 1cff6b52c57f6fa1a28564a5f52747d0e4ee5ec4 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Thu, 3 Dec 2020 19:30:38 +0100
Subject: [PATCH 2/2] Fix linter warning
---
scripts/upgrade | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/scripts/upgrade b/scripts/upgrade
index 5ea6b12..7fe1cc5 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -386,6 +386,13 @@ then
ynh_app_setting_set "$app" skipped_uris "/"
fi
+#=================================================
+# INTEGRATE SERVICE IN YUNOHOST
+#=================================================
+ynh_script_progression --message="Integrating service in YunoHost..."
+
+yunohost service add $app --log "$final_path/log/unicorn.stderr.log" "$final_path/log/unicorn.stdout.log" "$final_path/log/production.log"
+
#=================================================
# START SYSTEMD SERVICE
#=================================================