From 17e167a74b3e36cff69e728436331034de79e6c7 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Sun, 3 Jun 2018 17:24:21 +0200
Subject: [PATCH] Upgrade to upstream version 2.0.0

---
 README.md            | 7 +++++--
 conf/app.src         | 4 ++--
 conf/systemd.service | 1 +
 manifest.json        | 2 +-
 scripts/install      | 1 +
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 5027a0a..cd7d3b8 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:** 1.9.7
+**Shipped version:** 2.0.0
 
 ## Screenshots
 
@@ -83,7 +83,10 @@ When disabling Local Login and other authentication services, clicking the `Logi
 * Tested on ARM
 
 ## Limitations
-Known non impacting log messages:
+### Known problems
+* On ARM devices, default generated avatars are missing the profile initials (they are only a plain discus)
+
+### Known non-impacting log messages
 ```
 fatal: Not a git repository (or any of the parent directories): .git
 
diff --git a/conf/app.src b/conf/app.src
index e3745a9..441d37e 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,3 +1,3 @@
-SOURCE_URL=https://github.com/discourse/discourse/archive/v1.9.7.tar.gz
-SOURCE_SUM=780e30318b1c0f7c79f788418990dee8e319e11015bcb66687a5bdc11e437363
+SOURCE_URL=https://github.com/discourse/discourse/archive/v2.0.0.tar.gz
+SOURCE_SUM=bc1bd9771c5c0c8fc282ac1d29c47ba67a28a8054803a23b451d697886d7fa92
 SOURCE_FORMAT=tar.gz
diff --git a/conf/systemd.service b/conf/systemd.service
index 359d689..35beda8 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -11,6 +11,7 @@ Group=__APP__
 WorkingDirectory=__FINALPATH__
 Environment=__ADDITIONAL_ENV__
 Environment=RAILS_ENV=production
+Environment=UNICORN_SIDEKIQS=1
 Environment=LD_PRELOAD=__LIBJEMALLOC__
 ExecStart=__RBENVROOT__/shims/bundle exec unicorn --config config/unicorn.conf.rb -E production
 Restart=always
diff --git a/manifest.json b/manifest.json
index 699a03b..6f72fda 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "photo gallery",
         "fr": "Galerie photo"
     },
-    "version": "1.9.7~ynh1",
+    "version": "2.0.0~ynh1",
     "url": "http://Discourse.org",
     "license": "GPL-2.0",
     "maintainer": {
diff --git a/scripts/install b/scripts/install
index 6363f69..2f2172f 100644
--- a/scripts/install
+++ b/scripts/install
@@ -224,6 +224,7 @@ INSERT INTO site_settings (name, data_type, value, created_at, updated_at) VALUE
 INSERT INTO site_settings (name, data_type, value, created_at, updated_at) VALUES ('favicon_url', 1, '${path_url%/}/images/default-favicon.ico', 'NOW()', 'NOW()');
 INSERT INTO site_settings (name, data_type, value, created_at, updated_at) VALUES ('apple_touch_icon_url', 1, '${path_url%/}/images/default-apple-touch-icon.png', 'NOW()', 'NOW()');
 INSERT INTO site_settings (name, data_type, value, created_at, updated_at) VALUES ('wizard_enabled', 5, 'f', 'NOW()', 'NOW()');
+INSERT INTO site_settings (name, data_type, value, created_at, updated_at) VALUES ('force_https', 5, 't', 'NOW()', 'NOW()');
 "
 
 #=================================================