From 6b55b940e8a9e53f87ae2c6c71f261a572e54e79 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Wed, 22 Aug 2018 22:11:39 +0200
Subject: [PATCH] Upgrade to upstream version 2.0.4

---
 README.md       | 2 +-
 check_process   | 6 +++---
 conf/app.src    | 4 ++--
 manifest.json   | 2 +-
 scripts/upgrade | 3 +++
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index f321806..5d586f5 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,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.0.3
+**Shipped version:** 2.0.4
 
 ## Screenshots
 
diff --git a/check_process b/check_process
index 0749fa6..7909cb5 100644
--- a/check_process
+++ b/check_process
@@ -12,7 +12,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		upgrade=1 from_commit=f67986641f48d9e7b5df99f13fefe460094a5d81
+		upgrade=1 from_commit=c97db21b4a821651355c48c4f7efdfb763e2a072
 		backup_restore=1
 # Activate multi-instance test only if you have more than 2Gb RAM!
 		multi_instance=1
@@ -36,6 +36,6 @@
 Email=
 Notification=none
 ;;; Upgrade options
-	; commit=f67986641f48d9e7b5df99f13fefe460094a5d81
-		name=Use unicorn instead of puma, hence not needing a separate sidekiq ser
+	; commit=c97db21b4a821651355c48c4f7efdfb763e2a072
+		name=Upgrade to upstream version 2.0.2
 		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1&
diff --git a/conf/app.src b/conf/app.src
index 84c4ff6..8f14a2c 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,3 +1,3 @@
-SOURCE_URL=https://github.com/discourse/discourse/archive/v2.0.3.tar.gz
-SOURCE_SUM=ce6d91e429cea8f5e7c2ac005ae3908986c086a83a684d21a0c608bc3b21e757
+SOURCE_URL=https://github.com/discourse/discourse/archive/v2.0.4.tar.gz
+SOURCE_SUM=fdc303ae5ae4377f155be9f4e41ce74ddcab50543b7d6366333cf9194e1bcb93
 SOURCE_FORMAT=tar.gz
diff --git a/manifest.json b/manifest.json
index f837a00..7dc39d7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Discussion platform",
         "fr": "Plateforme de discussion"
     },
-    "version": "2.0.3~ynh1",
+    "version": "2.0.4~ynh1",
     "url": "http://Discourse.org",
     "license": "GPL-2.0",
     "maintainer": {
diff --git a/scripts/upgrade b/scripts/upgrade
index 6bda166..23f5c19 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -134,6 +134,9 @@ if ! ynh_is_upstream_up_to_date ; then
 	# Configure redis
 	ynh_replace_string "redis_db = 0" "redis_db = $redis_db" "$discourse_config_file"
 
+	# Don't notify on new versions (handled by the YunoHost package)
+	ynh_replace_string "new_version_emails = true" "new_version_emails = false" "$discourse_config_file"
+	
 	# Calculate and store the config file checksum
 	ynh_store_file_checksum "$discourse_config_file"