From f7b9a036f6ea518913ecd90c5466ec8eff065292 Mon Sep 17 00:00:00 2001 From: oufmilo Date: Fri, 11 Jun 2021 19:42:30 +0200 Subject: [PATCH] Update 12.83.0 --- check_process | 2 +- scripts/change_url | 113 --------------------------------------------- 2 files changed, 1 insertion(+), 114 deletions(-) delete mode 100644 scripts/change_url diff --git a/check_process b/check_process index bfc6708..916f0f1 100644 --- a/check_process +++ b/check_process @@ -14,7 +14,7 @@ #upgrade=1 from_commit=96332268263da1ddf330e2ce3925722c8408049a backup_restore=1 multi_instance=1 - change_url=1 + change_url=0 ;;; Options Email= Notification= diff --git a/scripts/change_url b/scripts/change_url deleted file mode 100644 index 570bcbf..0000000 --- a/scripts/change_url +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash - -#================================================= -# GENERIC STARTING -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - -source _common.sh -source /usr/share/yunohost/helpers - -#================================================= -# 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 - -app=$YNH_APP_INSTANCE_NAME - -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 - -# Needed for helper "ynh_add_nginx_config" -final_path=$(ynh_app_setting_get --app=$app --key=final_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 -#================================================= -# MODIFY URL IN NGINX CONF -#================================================= -ynh_script_progression --message="Updating NGINX web server configuration..." --weight=2 - -nginx_conf_path=/etc/nginx/conf.d/$old_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="$nginx_conf_path" - # Set global variables for NGINX helper - domain="$old_domain" - 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 - # Delete file checksum for the old conf file location - ynh_delete_file_checksum --file="$nginx_conf_path" - mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf - # Store file checksum for the new config file location - ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" -fi - -#================================================= -# SETUP FAIL2BAN -#================================================= -ynh_script_progression --message="Configuring Fail2Ban..." --weight=10 - -# Remove the config file with $old_domain -ynh_remove_fail2ban_config - -# Add config file with $new_domain -ynh_add_fail2ban_config --logpath="/var/log/nginx/${new_domain}-error.log" --failregex="^.*authentication failure\" while reading response header from upstream, client: ,.*$" --max_retry=5 - -#================================================= -# SPECIFIC MODIFICATIONS -#================================================= -ynh_script_progression --message="Applying Misskey specific modifications..." --weight=2 - -if [ $change_domain -eq 1 ] -then - # Change domain in Misskey configuration - ynh_replace_string --match_string="'${old_domain}'" --replace_string="'${new_domain}'" --target_file="${final_path}/config.php" -fi -#================================================= -# GENERIC FINALISATION -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=2 - -ynh_systemd_action --service_name=nginx --action=reload - -#================================================= -# END OF SCRIPT -#================================================= - -ynh_script_progression --message="Change of URL completed for Misskey" --last