From bce7908698290410c62a9dd9c4a813d6a590b487 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Fri, 19 Mar 2021 20:38:51 +0100
Subject: [PATCH 1/7] Update nginx.conf

---
 conf/nginx.conf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 2cabe2d..f2ba50c 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,4 +1,4 @@
-location /mopidy/ws/ {
+location /mopidy/ws {
 	
 	# Force usage of https
 	if ($scheme = http) {
@@ -22,7 +22,7 @@ location __PATH__/ {
 		rewrite ^ https://$server_name$request_uri? permanent;
 	}
 	
-	proxy_pass           http://localhost:__PORT__/musicbox_webclient;
+	proxy_pass           http://localhost:__PORT__/musicbox_webclient/;
 	proxy_http_version   1.1;
 	proxy_set_header     Host $host;
 
@@ -37,7 +37,7 @@ location /musicbox_webclient/ {
 		rewrite ^ https://$server_name$request_uri? permanent;
 	}
 	
-	proxy_pass           http://localhost:6680/musicbox_webclient;
+	proxy_pass           http://localhost:6680;
         proxy_http_version   1.1;
         proxy_set_header     Host $host;
 
@@ -52,7 +52,7 @@ location /local/ {
 		rewrite ^ https://$server_name$request_uri? permanent;
 	}
 	
-	proxy_pass           http://localhost:6680/local;
+	proxy_pass           http://localhost:6680;
         proxy_http_version   1.1;
         proxy_set_header     Host $host;
 

From b831ad8aa256da6e35db0f34f148c1658835ab5d Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Fri, 19 Mar 2021 20:41:54 +0100
Subject: [PATCH 2/7] improve progression bar

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 4102f9b..5cd40ea 100755
--- a/scripts/install
+++ b/scripts/install
@@ -65,7 +65,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Installing dependencies..." --weight=40
+ynh_script_progression --message="Installing dependencies..." --weight=20
 
 ynh_install_app_dependencies $pkg_dependencies
 

From 5a3d979e72bd05eba936e7979294359b20e05a4d Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Fri, 19 Mar 2021 21:17:26 +0100
Subject: [PATCH 3/7] simplify manifest

---
 manifest.json | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/manifest.json b/manifest.json
index ff8c6f9..559ca36 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,10 +3,9 @@
 	"id": "mopidy",
 	"packaging_format": 1,
 	"description": {
-		"en": "Mopidy - is an extensible music server written in Python.",
-		"fr": "Mopidy - est un serveur de musique extensible écrit en Python"
+		"en": "An extensible music server to play audio from your music collection and various streaming services"
 	},
-	"version": "1.0.2",
+	"version": "3.1.1-ynh1",
 	"url": "https://www.mopidy.com/",
 	"license": "Apache-2.0",
 	"maintainer": {
@@ -29,29 +28,17 @@
 			{
 				"name": "domain",
 				"type": "domain",
-				"ask": {
-					"en": "Choose a domain name for Mopidy",
-					"fr": "Choisissez un nom de domaine pour Mopidy"
-				},
 				"example": "example.org"
 			},
 			{
 				"name": "path",
 				"type": "path",
-				"ask": {
-					"en": "Choose a path for Mopidy",
-					"fr": "Choisissez un chemin pour Mopidy"
-				},
 				"example": "/mopidy",
 				"default": "/mopidy"
 			},
 			{
 				"name": "is_public",
 				"type": "boolean",
-				"ask": {
-					"en": "Is it a public application?",
-					"fr": "Est-ce une application publique ?"
-				},
 				"default": true
 			}
 		]

From 58aa835463fb012282d8aad1709c11ef46f2a11b Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Fri, 19 Mar 2021 22:11:11 +0100
Subject: [PATCH 4/7] Update manifest.json

---
 manifest.json | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/manifest.json b/manifest.json
index 559ca36..ff8c6f9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,9 +3,10 @@
 	"id": "mopidy",
 	"packaging_format": 1,
 	"description": {
-		"en": "An extensible music server to play audio from your music collection and various streaming services"
+		"en": "Mopidy - is an extensible music server written in Python.",
+		"fr": "Mopidy - est un serveur de musique extensible écrit en Python"
 	},
-	"version": "3.1.1-ynh1",
+	"version": "1.0.2",
 	"url": "https://www.mopidy.com/",
 	"license": "Apache-2.0",
 	"maintainer": {
@@ -28,17 +29,29 @@
 			{
 				"name": "domain",
 				"type": "domain",
+				"ask": {
+					"en": "Choose a domain name for Mopidy",
+					"fr": "Choisissez un nom de domaine pour Mopidy"
+				},
 				"example": "example.org"
 			},
 			{
 				"name": "path",
 				"type": "path",
+				"ask": {
+					"en": "Choose a path for Mopidy",
+					"fr": "Choisissez un chemin pour Mopidy"
+				},
 				"example": "/mopidy",
 				"default": "/mopidy"
 			},
 			{
 				"name": "is_public",
 				"type": "boolean",
+				"ask": {
+					"en": "Is it a public application?",
+					"fr": "Est-ce une application publique ?"
+				},
 				"default": true
 			}
 		]

From 016d051833b5ff6403d4a6c745e199f73b25b81e Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Fri, 19 Mar 2021 22:36:56 +0100
Subject: [PATCH 5/7] Update manifest.json

---
 manifest.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/manifest.json b/manifest.json
index ff8c6f9..b6df8ac 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,10 +3,9 @@
 	"id": "mopidy",
 	"packaging_format": 1,
 	"description": {
-		"en": "Mopidy - is an extensible music server written in Python.",
-		"fr": "Mopidy - est un serveur de musique extensible écrit en Python"
+		"en": "An extensible music server to play music, podcasts and radio programs from local disk and various streaming services"
 	},
-	"version": "1.0.2",
+	"version": "3.1.1-ynh1",
 	"url": "https://www.mopidy.com/",
 	"license": "Apache-2.0",
 	"maintainer": {
@@ -52,7 +51,7 @@
 					"en": "Is it a public application?",
 					"fr": "Est-ce une application publique ?"
 				},
-				"default": true
+				"default": false
 			}
 		]
 	}

From 0b47210417dcbb059390adb149d1b107b96d527e Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Fri, 19 Mar 2021 22:47:55 +0100
Subject: [PATCH 6/7] Update manifest.json

---
 manifest.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/manifest.json b/manifest.json
index b6df8ac..e44f0a4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -28,10 +28,6 @@
 			{
 				"name": "domain",
 				"type": "domain",
-				"ask": {
-					"en": "Choose a domain name for Mopidy",
-					"fr": "Choisissez un nom de domaine pour Mopidy"
-				},
 				"example": "example.org"
 			},
 			{

From 6940c1ff1a8b0f5d51db835611f22712bdb9a6d9 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Fri, 19 Mar 2021 23:06:47 +0100
Subject: [PATCH 7/7] Update manifest.json

---
 manifest.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/manifest.json b/manifest.json
index e44f0a4..0300749 100644
--- a/manifest.json
+++ b/manifest.json
@@ -28,6 +28,10 @@
 			{
 				"name": "domain",
 				"type": "domain",
+                		"ask": {
+   					"en": "Choose a domain for Mopidy",
+                    			"fr": "Choisissez un domaine pour Mopidy"
+                			},
 				"example": "example.org"
 			},
 			{