From d84761e72c8506bf15ce31f2b6ab483a43bc6f07 Mon Sep 17 00:00:00 2001
From: Pierrick <contact@pierrick.io>
Date: Sat, 26 Jan 2019 20:00:47 +0100
Subject: [PATCH] Update O.18 - minimal

---
 conf/app-frontend.src |  6 +++---
 conf/app.src          |  4 ++--
 conf/nginx.conf       | 27 +++++++++------------------
 manifest.json         |  4 ++--
 4 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/conf/app-frontend.src b/conf/app-frontend.src
index 50f94c8..cb7763f 100644
--- a/conf/app-frontend.src
+++ b/conf/app-frontend.src
@@ -1,6 +1,6 @@
-SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/-/jobs/artifacts/0.17/download?job=build_front
-SOURCE_SUM=3578e1c60da578681c4e60a94dde1e18511f2455814c980b24748c87ffb8b4a2
+SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/0.18/download?job=build_front
+SOURCE_SUM=20faddbf6a74722826eb889df4ebd4fc18810ff80d3741608b1d86d17e4f408a
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=
\ No newline at end of file
+SOURCE_FILENAME=
diff --git a/conf/app.src b/conf/app.src
index dceef94..364a564 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/-/archive/0.17/funkwhale-0.17.tar.bz2
-SOURCE_SUM=100eb3dfa5285eb9886d05dd575251e24cf43525596083b3793e8f80e369db1b
+SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/archive/0.18/funkwhale-0.18.tar.bz2
+SOURCE_SUM=a2271056338dc89254e0b7847ebbb4cbddc7ea3fe28bf786eb0c794e316ddb02
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.bz2
 SOURCE_IN_SUBDIR=true
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 291203f..e30876c 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,22 +1,13 @@
 location / {
-	alias __FINALPATH__/code/front/dist/;
-
-	if ($scheme = http) {
-		rewrite ^ https://$server_name$request_uri? permanent;
-	}
-
-	try_files $uri $uri/ @rewrites;
-}
-
-location @rewrites {
-	rewrite ^(.+)$ /index.html last;
-}
-
-location /api/ {
 	include __FINALPATH__/code/deploy/funkwhale_proxy.conf;
-	# this is needed if you have file import via upload enabled
-	client_max_body_size 100M;
-	proxy_pass   http://127.0.0.1:__PORT__/api/;
+
+    # this is needed if you have file import via upload enabled
+    client_max_body_size 100M;
+    proxy_pass   http://127.0.0.1:__PORT__/;
+}
+
+location /front/ {
+	alias __FINALPATH__/code/front/dist/;
 }
 
 location /federation/ {
@@ -93,4 +84,4 @@ location /rest/ {
 location /_protected/music {
 	internal;
 	alias   __FINALPATH__/import;
-}
\ No newline at end of file
+}
diff --git a/manifest.json b/manifest.json
index 7ec8807..5e8a7b2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,7 +8,7 @@
 	"description": {
 		"en": "A modern, convivial and free music server"
 	},
-	"version": "0.17.0~ynh3",
+	"version": "0.18.0~ynh1",
 	"url": "https://funkwhale.audio",
 	"license": "BSD-3-Clause",
 	"maintainer": {
@@ -47,4 +47,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}