From 3f0f04c5a09ac293baa5d75ac2b99fc1c7ffc8a9 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>
Date: Thu, 28 Jun 2018 22:50:04 +0200
Subject: [PATCH 1/2] Remove backport usage

---
 manifest.json   | 2 +-
 scripts/install | 4 ----
 scripts/upgrade | 8 +++-----
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/manifest.json b/manifest.json
index 84f3688..4cf1095 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,7 +8,7 @@
 	"description": {
 		"en": "A modern, convivial and free music server"
 	},
-	"version": "0.15~ynh1",
+	"version": "0.15~ynh2",
 	"url": "https://funkwhale.audio",
 	"license": "BSD-3-Clause",
 	"maintainer": {
diff --git a/scripts/install b/scripts/install
index e2ce56b..0b6c80f 100644
--- a/scripts/install
+++ b/scripts/install
@@ -70,10 +70,6 @@ ynh_app_setting_set "$app" port "$port"
 # INSTALL DEPENDENCIES
 #=================================================
 
-# add backports (required to install ffmpeg)
-echo "deb http://httpredir.debian.org/debian stretch-backports main" | tee /etc/apt/sources.list.d/stretch-backports.list
-ynh_package_update
-
 ynh_install_app_dependencies build-essential curl ffmpeg \
 	libjpeg-dev libmagic-dev libpq-dev postgresql python3-dev python3-venv \
 	redis-server \
diff --git a/scripts/upgrade b/scripts/upgrade
index 14e0117..9d72bfd 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -35,11 +35,9 @@ if [ -z "$redis_db" ]; then
 	ynh_app_setting_set "$app" redis_db "$redis_db"
 fi
 
-# Make sure we use stretch backports and not jessie's
-if [ ! -f /etc/apt/sources.list.d/stretch-backports.list ]; then
-	echo "deb http://httpredir.debian.org/debian stretch-backports main" | tee /etc/apt/sources.list.d/stretch-backports.list
-	ynh_secure_remove /etc/apt/sources.list.d/jessie-backports.list
-fi
+# We don't need backports anymore
+ynh_secure_remove /etc/apt/sources.list.d/stretch-backports.list
+ynh_secure_remove /etc/apt/sources.list.d/jessie-backports.list
 
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP

From c9c8c4d86041fbace5975d2270f7b8e9eb35c0bf Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>
Date: Wed, 4 Jul 2018 23:08:58 +0200
Subject: [PATCH 2/2] Add https to FUNKWHALE_URL fix #23

---
 conf/env.prod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/env.prod b/conf/env.prod
index 56e4b9b..d6234f0 100644
--- a/conf/env.prod
+++ b/conf/env.prod
@@ -38,7 +38,7 @@ FUNKWHALE_API_PORT=__PORT__
 
 # Replace this by the definitive, public domain you will use for
 # your instance
-FUNKWHALE_URL=__DOMAIN__
+FUNKWHALE_URL=https://__DOMAIN__
 
 # Configure email sending using this variale
 # By default, funkwhale will output emails sent to stdout