YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1746 from YunoHost/fix_change_url

Browse source 
helpers: Further simplify the change url helper
This commit is contained in:
Alexandre Aubin 2023-12-05 19:17:42 +01:00 • committed by GitHub
commit 857a285b5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
helpers/nginx
View file

@ -44,35 +44,22 @@ ynh_remove_nginx_config() {
} }
# Move / regen the nginx config in a change url context # Regen the nginx config in a change url context
# #
# usage: ynh_change_url_nginx_config # usage: ynh_change_url_nginx_config
# #
# Requires YunoHost version 11.1.9 or higher. # Requires YunoHost version 11.1.9 or higher.
ynh_change_url_nginx_config() { ynh_change_url_nginx_config() {
# Make a backup of the original NGINX config file if manually modified
# (nb: this is possibly different from the same instruction called by
# ynh_add_config inside ynh_add_nginx_config because the path may have
# changed if we're changing the domain too...)
local old_nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf local old_nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
local new_nginx_conf_path=/etc/nginx/conf.d/$new_domain.d/$app.conf
# Change the path in the NGINX config file
if [ $change_path -eq 1 ]
then
# Make a backup of the original NGINX config file if modified
ynh_backup_if_checksum_is_different --file="$old_nginx_conf_path" ynh_backup_if_checksum_is_different --file="$old_nginx_conf_path"
# Set global variables for NGINX helper
domain="$old_domain"
path="$new_path"
path_url="$new_path"
# Create a dedicated NGINX config
ynh_add_nginx_config
fi
# Change the domain for NGINX
if [ $change_domain -eq 1 ]
then
ynh_delete_file_checksum --file="$old_nginx_conf_path" ynh_delete_file_checksum --file="$old_nginx_conf_path"
mv "$old_nginx_conf_path" "$new_nginx_conf_path" ynh_secure_remove --file="$old_nginx_conf_path"
ynh_store_file_checksum --file="$new_nginx_conf_path"
fi
ynh_systemd_action --service_name=nginx --action=reload
}
# Regen the nginx conf
ynh_add_nginx_config
}

2
src/app.py
View file

@ -478,6 +478,8 @@ def app_change_url(operation_logger, app, domain, path):
env_dict["old_path"] = old_path env_dict["old_path"] = old_path
env_dict["new_domain"] = domain env_dict["new_domain"] = domain
env_dict["new_path"] = path env_dict["new_path"] = path
env_dict["domain"] = domain
env_dict["path"] = path
env_dict["change_path"] = "1" if old_path != path else "0" env_dict["change_path"] = "1" if old_path != path else "0"
env_dict["change_domain"] = "1" if old_domain != domain else "0" env_dict["change_domain"] = "1" if old_domain != domain else "0"