diff --git a/manifest.json b/manifest.json index 7d1cfc6..21b29a0 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "A modern, convivial and free music server" }, - "version": "0.20.1~ynh2", + "version": "0.20.1~ynh3", "url": "https://funkwhale.audio", "license": "AGPL-3.0-or-later", "maintainer": { diff --git a/scripts/_common.sh b/scripts/_common.sh index e98f8be..180e689 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -15,40 +15,6 @@ pkg_dependencies="build-essential curl ffmpeg \ # PERSONAL HELPERS #================================================= -# funkwhale needs edits to the domain config file -# this function removes funkwhale specifics -funkwhale_nginx_domain_cleaning() { - local line - local tempFile - local nginxConf - - nginxConf="/etc/nginx/conf.d/$domain.conf" - tempFile="$nginxConf.temp" - - line=$(sed -n '/server /=' "$nginxConf" | head -n 1) - - tail -n +"$line" "$nginxConf" > "$tempFile" - mv "$tempFile" "$nginxConf" -} - -# funkwhale needs edits to the domain config file -# this function adds funkwhale specifics -funkwhale_nginx_domain_configure() { - local tempFile - local nginxConf - - nginxConf="/etc/nginx/conf.d/$domain.conf" - tempFile="$nginxConf.temp" - - echo " -# required for websocket support -map \$http_upgrade \$connection_upgrade { - default upgrade; - '' close; -} -" | cat - "$nginxConf" > "$tempFile" - mv "$tempFile" "$nginxConf" -} #================================================= # EXPERIMENTAL HELPERS diff --git a/scripts/install b/scripts/install index 2ce874a..c0a1315 100644 --- a/scripts/install +++ b/scripts/install @@ -106,9 +106,6 @@ ynh_setup_source --dest_dir="$final_path/code" --source_id="app-frontend" #================================================= ynh_print_info --message="Configuring nginx web server..." -# add funkwhale specifics at the beginning of the domain configuration -funkwhale_nginx_domain_configure - # Create a dedicated nginx config ynh_add_nginx_config diff --git a/scripts/remove b/scripts/remove index e23ea64..8cd36d7 100644 --- a/scripts/remove +++ b/scripts/remove @@ -103,9 +103,6 @@ ynh_secure_remove --file="/var/log/$app" #================================================= ynh_print_info --message="Removing nginx web server configuration" -# remove domain specific configuration -funkwhale_nginx_domain_cleaning - # Remove the dedicated nginx config ynh_remove_nginx_config diff --git a/scripts/upgrade b/scripts/upgrade index dc32818..956e563 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -128,12 +128,6 @@ ynh_setup_source --dest_dir="$final_path/code" --source_id="app-frontend" #================================================= ynh_print_info --message="Upgrading nginx web server configuration..." -# remove domain specific configuration -funkwhale_nginx_domain_cleaning - -# add funkwhale specifics at the beginning of the domain configuration -funkwhale_nginx_domain_configure - # Create a dedicated nginx config ynh_add_nginx_config