diff --git a/check_process b/check_process index 3aeb286..0bbceb1 100644 --- a/check_process +++ b/check_process @@ -15,7 +15,6 @@ upgrade=1 from_commit=bc421d01d57a273a59287cf7500e94a89de0abed backup_restore=1 multi_instance=0 - port_already_use=1 (6680) change_url=1 ;;; Options Email= diff --git a/conf/nginx.conf b/conf/nginx.conf index 1740a9d..72f345f 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,10 +1,5 @@ location /mopidy/ws { - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - proxy_pass http://localhost:__PORT__; proxy_http_version 1.1; proxy_set_header Host $host; diff --git a/manifest.json b/manifest.json index adb6887..aa7099c 100644 --- a/manifest.json +++ b/manifest.json @@ -12,7 +12,6 @@ "license": "Apache-2.0", "website": "https://www.mopidy.com", "admindoc": "https://docs.mopidy.com/en/latest", - "userdoc": "https://yunohost.org/apps/", "code": "https://github.com/mopidy/mopidy" }, "license": "Apache-2.0", @@ -25,7 +24,7 @@ "email": "cyp@rouquin.me" }, "requirements": { - "yunohost": ">= 4.2.0" + "yunohost": ">= 4.3.0" }, "multi_instance": false, "services": [ @@ -35,8 +34,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", diff --git a/scripts/restore b/scripts/restore index 6c6cf8f..782f58b 100755 --- a/scripts/restore +++ b/scripts/restore @@ -39,18 +39,7 @@ cmd_file="/usr/local/bin/mopidyctl" #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=3 -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " - -# Check web path availability -ynh_webpath_available $domain $path_url\ - || ynh_die --message="Path not available: ${domain}${path_url}" -ynh_webpath_available $domain "/musicbox_webclient"\ - || ynh_die --message="Path not available: ${domain}/musicbox_webclient" -ynh_webpath_available $domain "/mopidy"\ - || ynh_die --message="Path not available: ${domain}/mopidy" -ynh_webpath_available $domain "/local"\ - || ynh_die --message="Path not available: ${domain}/local" +test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS