diff --git a/manifest.json b/manifest.json index a01046f..cdcf8c1 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "josue@tille.ch" }, "requirements": { - "yunohost": ">= 2.7.2" + "yunohost": ">= 2.7.14.5" }, "multi_instance": true, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 42b3a14..cd7a707 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -57,10 +57,6 @@ config_horde() { } config_nginx() { - if [ "$path_url" != "/" ] - then - ynh_replace_string "^#sub_path_only" "" "../conf/nginx.conf" - fi ynh_add_nginx_config [[ $service_autodiscovery ]] && add_nginx_autodiscovery ynh_store_file_checksum "/etc/nginx/conf.d/$domain.d/$app.conf" diff --git a/scripts/change_url b/scripts/change_url index 5cd8cd0..a1a5878 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -7,8 +7,6 @@ # IMPORT GENERIC HELPERS source /usr/share/yunohost/helpers -cp -r /etc/yunohost/apps/horde/conf ../ # Quick hack for https://github.com/YunoHost/yunohost/pull/427 - # Exit if an error occurs during the execution of the script ynh_abort_if_errors @@ -18,9 +16,8 @@ source ./_common.sh # RETRIEVE ARGUMENTS old_domain=$YNH_APP_OLD_DOMAIN -old_path=$YNH_APP_OLD_PATH -new_domain=$YNH_APP_NEW_DOMAIN -new_path=$YNH_APP_NEW_PATH +domain=$YNH_APP_NEW_DOMAIN +path_url=$(ynh_normalize_url_path ${YNH_APP_NEW_PATH:-'/'}) app=$YNH_APP_INSTANCE_NAME admin=$(ynh_app_setting_get $app admin) @@ -32,28 +29,6 @@ db_name=$(ynh_app_setting_get $app db_name) db_user=$(ynh_app_setting_get $app db_user) db_pwd=$(ynh_app_setting_get $app mysqlpwd) -# CHECK THE SYNTAX OF THE PATHS -test -n "$old_path" || old_path="/" -test -n "$new_path" || new_path="/" -new_path=$(ynh_normalize_url_path $new_path) -old_path=$(ynh_normalize_url_path $old_path) - -domain="$new_domain" -path_url="$new_path" - -# CHECK WHICH PARTS SHOULD BE CHANGED -change_domain=0 -if [ "$old_domain" != "$new_domain" ] -then - change_domain=1 -fi - -change_path=0 -if [ "$old_path" != "$new_path" ] -then - change_path=1 -fi - #================================================= # STANDARD MODIFICATIONS #================================================= @@ -62,13 +37,13 @@ fi nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf # Change the domain for nginx -if [ $change_domain -eq 1 ] +if [ "$old_domain" != "$domain" ] then # Delete file checksum for the old conf file location ynh_delete_file_checksum "$nginx_conf_path" - mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf + mv $nginx_conf_path /etc/nginx/conf.d/$domain.d/$app.conf # Store file checksum for the new config file location - ynh_store_file_checksum "/etc/nginx/conf.d/$new_domain.d/$app.conf" + ynh_store_file_checksum "/etc/nginx/conf.d/$domain.d/$app.conf" fi config_nginx