From 20f3c6cd1752d4c57e2fc9dc5465fbd7b1d2590a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 27 May 2023 16:33:33 +0200 Subject: [PATCH] fix --- scripts/change_url | 101 ++++----------------------------------------- scripts/restore | 10 ++++- scripts/upgrade | 10 ++++- 3 files changed, 26 insertions(+), 95 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index fc2d8a7..6e2aba2 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -9,59 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# RETRIEVE ARGUMENTS -#================================================= - -#REMOVEME? old_domain=$YNH_APP_OLD_DOMAIN -#REMOVEME? old_path=$YNH_APP_OLD_PATH - -#REMOVEME? new_domain=$YNH_APP_NEW_DOMAIN -#REMOVEME? new_path=$YNH_APP_NEW_PATH - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 - -#REMOVEME? # Needed for helper "ynh_add_nginx_config" -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) - -#================================================= -# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP -#================================================= -#REMOVEME? ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 - -# Backup the current version of the app -#REMOVEME? ynh_backup_before_upgrade -#REMOVEME? ynh_clean_setup () { - # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. -#REMOVEME? ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" - - # Restore it if the upgrade fails -#REMOVEME? ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors - -#================================================= -# CHECK WHICH PARTS SHOULD BE CHANGED -#================================================= - -#REMOVEME? change_domain=0 -#REMOVEME? if [ "$old_domain" != "$new_domain" ] -then - #REMOVEME? change_domain=1 -fi - -#REMOVEME? change_path=0 -#REMOVEME? if [ "$old_path" != "$new_path" ] -then - #REMOVEME? change_path=1 -fi - #================================================= # STANDARD MODIFICATIONS #================================================= @@ -69,7 +16,11 @@ fi #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app-server --action="stop" --log_path="/var/log/$app/$app-server.log" +ynh_systemd_action --service_name=$app-microservices --action="stop" --log_path="/var/log/$app/$app-microservices.log" +ynh_systemd_action --service_name=$app-ml --action="stop" --log_path="/var/log/$app/$app-ml.log" +ynh_systemd_action --service_name=$app-web --action="stop" --log_path="/var/log/$app/$app-web.log" + #================================================= # MODIFY URL IN NGINX CONF @@ -78,36 +29,6 @@ ynh_script_progression --message="Updating NGINX web server configuration..." -- ynh_change_url_nginx_config -#REMOVEME? 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 -#REMOVEME? ynh_backup_if_checksum_is_different --file="$nginx_conf_path" - # Set global variables for NGINX helper -#REMOVEME? domain="$old_domain" -#REMOVEME? path="$new_path" - # Create a dedicated NGINX config -#REMOVEME? 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 -#REMOVEME? ynh_delete_file_checksum --file="$nginx_conf_path" -#REMOVEME? mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf - # Store file checksum for the new config file location -#REMOVEME? ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" -fi - -#================================================= -# SPECIFIC MODIFICATIONS -#================================================= -# ... -#================================================= - #================================================= # GENERIC FINALISATION #================================================= @@ -115,14 +36,10 @@ fi #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" - -#================================================= -# RELOAD NGINX -#================================================= -#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - -#REMOVEME? #REMOVEME? ynh_systemd_action --service_name=nginx --action=reload +ynh_systemd_action --service_name=$app-server --action="start" --log_path="/var/log/$app/$app-server.log" +ynh_systemd_action --service_name=$app-microservices --action="start" --log_path="/var/log/$app/$app-microservices.log" +ynh_systemd_action --service_name=$app-ml --action="start" --log_path="/var/log/$app/$app-ml.log" +ynh_systemd_action --service_name=$app-web --action="start" --log_path="/var/log/$app/$app-web.log" #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index b0e6ed0..56ceb3d 100755 --- a/scripts/restore +++ b/scripts/restore @@ -63,14 +63,20 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app" #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log" +yunohost service add $app-server --description="Immich Server" --log=/var/log/$app/$app-server.log +yunohost service add $app-microservices --description="Immich Microservices" --log=/var/log/$app/$app-microservices.log +yunohost service add $app-ml --description="Immich Machine Learning" --log=/var/log/$app/$app-ml.log +yunohost service add $app-web --description="Immich Web" --log=/var/log/$app/$app-web.log #================================================= # START SYSTEMD SERVICE #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app-server --action="start" --log_path="/var/log/$app/$app-server.log" +ynh_systemd_action --service_name=$app-microservices --action="start" --log_path="/var/log/$app/$app-microservices.log" +ynh_systemd_action --service_name=$app-ml --action="start" --log_path="/var/log/$app/$app-ml.log" +ynh_systemd_action --service_name=$app-web --action="start" --log_path="/var/log/$app/$app-web.log" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index b5b1318..7986c80 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -72,12 +72,20 @@ ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log" +yunohost service add $app-server --description="Immich Server" --log=/var/log/$app/$app-server.log +yunohost service add $app-microservices --description="Immich Microservices" --log=/var/log/$app/$app-microservices.log +yunohost service add $app-ml --description="Immich Machine Learning" --log=/var/log/$app/$app-ml.log +yunohost service add $app-web --description="Immich Web" --log=/var/log/$app/$app-web.log + #================================================= # START SYSTEMD SERVICE #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app-server --action="start" --log_path="/var/log/$app/$app-server.log" +ynh_systemd_action --service_name=$app-microservices --action="start" --log_path="/var/log/$app/$app-microservices.log" +ynh_systemd_action --service_name=$app-ml --action="start" --log_path="/var/log/$app/$app-ml.log" +ynh_systemd_action --service_name=$app-web --action="start" --log_path="/var/log/$app/$app-web.log" #================================================= # END OF SCRIPT