From 7dad072155fd728c49ce5379964307f578fd9b81 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 7 Mar 2019 03:29:14 +0100 Subject: [PATCH 1/5] Add change_url script --- scripts/change_url | 111 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 scripts/change_url diff --git a/scripts/change_url b/scripts/change_url new file mode 100644 index 0000000..93a67da --- /dev/null +++ b/scripts/change_url @@ -0,0 +1,111 @@ +#!/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_print_info "Loading installation settings..." + +# Needed for helper "ynh_add_nginx_config" +final_path=$(ynh_app_setting_get $app final_path) + +# Add settings here as needed by your application +#db_name=$(ynh_app_setting_get "$app" db_name) +#db_pwd=$(ynh_app_setting_get $app db_pwd) + +#================================================= +# 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) + +#================================================= +# 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_print_info "Updating nginx web server configuration..." + +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 "$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 "$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 "/etc/nginx/conf.d/$new_domain.d/$app.conf" +fi + +#================================================= +# SPECIFIC MODIFICATIONS +#================================================= +# ... +#================================================= + +#================================================= +# GENERIC FINALISATION +#================================================= +# RELOAD NGINX +#================================================= +ynh_print_info "Reloading nginx web server..." + +systemctl reload nginx + +#================================================= +# END OF SCRIPT +#================================================= + +ynh_print_info "Change of URL completed for $app" From c6fd2bf9af60624f229e47b2a00a45d59ac09424 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 7 Mar 2019 03:58:49 +0100 Subject: [PATCH 2/5] fix node --- conf/systemd.service | 2 +- scripts/install | 1 + scripts/upgrade | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index 5abbcbf..9fbf394 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -9,7 +9,7 @@ User=__APP__ Group=__APP__ EnvironmentFile=__FINALPATH__/.env WorkingDirectory=__FINALPATH__ -ExecStart=/opt/node_n/bin/node __FINALPATH__/main.js +ExecStart=__NODEJS_PATH__/node __FINALPATH__/main.js Restart=on-failure #StartLimitInterval=86400 #StartLimitBurst=5 diff --git a/scripts/install b/scripts/install index 972a8a2..d08fd8f 100755 --- a/scripts/install +++ b/scripts/install @@ -189,6 +189,7 @@ ynh_print_info "Configuring a systemd service..." ### - And the section "SETUP SYSTEMD" in the upgrade script # Create a dedicated systemd config +ynh_replace_string "__NODEJS_PATH__" "$nodejs_path" "../conf/systemd.service" ynh_add_systemd_config #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 89329c1..067e9b3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -72,6 +72,7 @@ if ynh_version_gt "0.77-2" "${previous_version}" ; then ynh_install_nodejs 8.15.1 ynh_use_nodejs # Create a dedicated systemd config + ynh_replace_string "__NODEJS_PATH__" "$nodejs_path" "../conf/systemd.service" ynh_add_systemd_config # Create a dedicated .env config ynh_backup_if_checksum_is_different "$final_path/.env" From 47225aa0b5add4617ec10803f471d294d8518e41 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 7 Mar 2019 11:52:49 +0100 Subject: [PATCH 3/5] update mail url --- conf/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/.env b/conf/.env index 3a664d8..dbf037d 100644 --- a/conf/.env +++ b/conf/.env @@ -14,7 +14,7 @@ MONGO_URL=mongodb://127.0.0.1:27017/__DB_NAME__ ROOT_URL=https://__DOMAIN_URI__ # Mail URL -MAIL_URL='smtp://localhost:25/' +MAIL_URL=smtp://localhost # This is local port where Wekan Node.js runs PORT=__PORT__ From 743021283c90d23ccc190e1370165be50daa2193 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 7 Mar 2019 12:12:10 +0100 Subject: [PATCH 4/5] Fix change URL --- check_process | 2 +- scripts/change_url | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index 6a85be0..d97cd59 100644 --- a/check_process +++ b/check_process @@ -15,7 +15,7 @@ multi_instance=1 incorrect_path=1 port_already_use=1 - change_url=0 + change_url=1 ;;; Levels Level 1=auto Level 2=auto diff --git a/scripts/change_url b/scripts/change_url index 93a67da..7f39e9c 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -92,8 +92,14 @@ fi #================================================= # SPECIFIC MODIFICATIONS #================================================= -# ... +# MODIFY URL IN .ENV #================================================= +ynh_print_info "Updating .env configuration..." + +ynh_replace_string "__NODEJS_PATH__" "$nodejs_path" "$final_path/.env" +ynh_replace_string "__DB_NAME__" "$db_name" "$final_path/.env" +ynh_replace_string "__DOMAIN_URI__" "$new_domain$new_path" "$final_path/.env" +ynh_replace_string "__PORT__" "$port" "$final_path/.env" #================================================= # GENERIC FINALISATION From b2c572811212914be31ba066fdba38818aee3ab1 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 7 Mar 2019 13:47:05 +0100 Subject: [PATCH 5/5] reboot services --- scripts/change_url | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/change_url b/scripts/change_url index 7f39e9c..453358f 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -7,6 +7,7 @@ #================================================= source _common.sh +source ynh_systemd_action source /usr/share/yunohost/helpers #================================================= @@ -96,10 +97,13 @@ fi #================================================= ynh_print_info "Updating .env configuration..." +ynh_systemd_action --action=stop --service_name=$app --log_path="systemd" ynh_replace_string "__NODEJS_PATH__" "$nodejs_path" "$final_path/.env" ynh_replace_string "__DB_NAME__" "$db_name" "$final_path/.env" ynh_replace_string "__DOMAIN_URI__" "$new_domain$new_path" "$final_path/.env" ynh_replace_string "__PORT__" "$port" "$final_path/.env" +ynh_systemd_action --action=start --service_name=$app --log_path="systemd" --line_match="Finishing add-custom-html-before-body-end migration" +sleep 10 #================================================= # GENERIC FINALISATION