From 11031a71d47d70f0f5891716065ea80194244f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 1 Nov 2023 10:13:59 +0100 Subject: [PATCH] fix --- ...esk-server.service => rustdeskrelay.service} | 0 ...desk-hbbs.service => rustdesksignal.service} | 0 scripts/backup | 4 ++-- scripts/change_url | 8 ++++---- scripts/install | 13 +++++++------ scripts/remove | 12 ++++++------ scripts/restore | 17 +++++++++++++---- scripts/upgrade | 13 +++++++++---- 8 files changed, 41 insertions(+), 26 deletions(-) rename conf/{rustdesk-server.service => rustdeskrelay.service} (100%) rename conf/{rustdesk-hbbs.service => rustdesksignal.service} (100%) diff --git a/conf/rustdesk-server.service b/conf/rustdeskrelay.service similarity index 100% rename from conf/rustdesk-server.service rename to conf/rustdeskrelay.service diff --git a/conf/rustdesk-hbbs.service b/conf/rustdesksignal.service similarity index 100% rename from conf/rustdesk-hbbs.service rename to conf/rustdesksignal.service diff --git a/scripts/backup b/scripts/backup index 203cfd1..da8f6c0 100755 --- a/scripts/backup +++ b/scripts/backup @@ -31,8 +31,8 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" # BACKUP SYSTEMD #================================================= -ynh_backup --src_path="/etc/systemd/system/rustdesk-server.service" -ynh_backup --src_path="/etc/systemd/system/rustdesk-hbbs.service" +ynh_backup --src_path="/etc/systemd/system/rustdeskrelay.service" +ynh_backup --src_path="/etc/systemd/system/rustdesksignal.service" #================================================= # END OF SCRIPT diff --git a/scripts/change_url b/scripts/change_url index e4a574c..de9cf86 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -16,8 +16,8 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=rustdesk-server --action="stop" --log_path="systemd" -ynh_systemd_action --service_name=rustdesk-hbbs --action="stop" --log_path="systemd" +ynh_systemd_action --service_name=rustdeskrelay --action="stop" --log_path="systemd" +ynh_systemd_action --service_name=rustdesksignal --action="stop" --log_path="systemd" #================================================= # MODIFY URL IN NGINX CONF @@ -33,8 +33,8 @@ ynh_change_url_nginx_config #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=rustdesk-server --action="start" --log_path="systemd" -ynh_systemd_action --service_name=rustdesk-hbbs --action="start" --log_path="systemd" +ynh_systemd_action --service_name=rustdeskrelay --action="start" --log_path="systemd" +ynh_systemd_action --service_name=rustdesksignal --action="start" --log_path="systemd" #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index 835aecb..ae38f0b 100755 --- a/scripts/install +++ b/scripts/install @@ -32,12 +32,13 @@ ynh_script_progression --message="Adding system configurations related to $app.. ynh_add_nginx_config # Create a dedicated systemd config -ynh_add_systemd_config --service=rustdesk-server --template=rustdesk-server.service -ynh_add_systemd_config --service=rustdesk-hbbs --template=rustdesk-hbbs.service +ynh_add_systemd_config --service=rustdeskrelay --template=rustdeskrelay.service +ynh_add_systemd_config --service=rustdesksignal --template=rustdesksignal.service -yunohost service add rustdesk-server --description="Remote control alternative for self-hosting" --log="/var/log/$app/$app.log" -yunohost service add rustdesk-hbbs --description="Remote control alternative for self-hosting" --log="/var/log/$app/$app.log" +yunohost service add rustdeskrelay --description="Rustdesk Relay Server" --log="/var/log/$app/$app.log" +yunohost service add rustdesksignal --description="Rustdesk Signal Server" --log="/var/log/$app/$app.log" +#================================================= # HANDLE LOG FILES AND LOGROTATE #================================================= ynh_script_progression --message="Configuring log rotation..." --weight=1 @@ -70,8 +71,8 @@ ynh_use_logrotate ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=rustdesk-server --action="start" --log_path="systemd" -ynh_systemd_action --service_name=rustdesk-hbbs --action="start" --log_path="systemd" +ynh_systemd_action --service_name=rustdeskrelay --action="start" --log_path="systemd" +ynh_systemd_action --service_name=rustdesksignal --action="start" --log_path="systemd" #================================================= # END OF SCRIPT diff --git a/scripts/remove b/scripts/remove index 3090921..aa28cf8 100755 --- a/scripts/remove +++ b/scripts/remove @@ -19,17 +19,17 @@ ynh_script_progression --message="Removing system configurations related to $app # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $rustdesk-server >/dev/null then - ynh_script_progression --message="Removing $rustdesk-server service integration..." --weight=1 - yunohost service remove $rustdesk-server + ynh_script_progression --message="Removing $rustdeskrelay service integration..." --weight=1 + yunohost service remove $rustdeskrelay fi -if ynh_exec_warn_less yunohost service status $rustdesk-hbbs >/dev/null +if ynh_exec_warn_less yunohost service status $rustdesksignal >/dev/null then - ynh_script_progression --message="Removing $rustdesk-hbbs service integration..." --weight=1 + ynh_script_progression --message="Removing $rustdesksignal service integration..." --weight=1 yunohost service remove $rustdesk-hbbs fi -ynh_remove_systemd_config --service=rustdesk-server -ynh_remove_systemd_config --service=rustdesk-hbbs +ynh_remove_systemd_config --service=rustdeskrelay +ynh_remove_systemd_config --service=rustdesksignal ynh_remove_nginx_config diff --git a/scripts/restore b/scripts/restore index a3aa7b5..b8f004f 100755 --- a/scripts/restore +++ b/scripts/restore @@ -18,6 +18,8 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" chown -R $app:www-data "$install_dir" +chmod +x "$install_dir/hbbr" +chmod +x "$install_dir/hbbs" #================================================= # RESTORE SYSTEM CONFIGURATIONS @@ -28,10 +30,16 @@ ynh_script_progression --message="Restoring system configurations related to $ap ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" -ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -systemctl enable $app.service --quiet +ynh_restore_file --origin_path="/etc/systemd/system/$rustdeskrelay.service" +systemctl enable $rustdeskrelay.service --quiet -yunohost service add $app --description="Remote control alternative for self-hosting" --log="/var/log/$app/$app.log" +ynh_restore_file --origin_path="/etc/systemd/system/$ --description="Rustdesk Signal Server" --log="/var/log/$app/$app.log" +.service" +systemctl enable $ --description="Rustdesk Signal Server" --log="/var/log/$app/$app.log" +.service --quiet + +yunohost service add rustdeskrelay --description="Rustdesk Relay Server" --log="/var/log/$app/$app.log" +yunohost service add rustdesksignal --description="Rustdesk Signal Server" --log="/var/log/$app/$app.log" #================================================= # GENERIC FINALIZATION @@ -41,7 +49,8 @@ yunohost service add $app --description="Remote control alternative for self-hos ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1 # Typically you only have either $app or php-fpm but not both at the same time... -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" +ynh_systemd_action --service_name=rustdeskrelay --action="start" --log_path="systemd" +ynh_systemd_action --service_name=rustdesksignal --action="start" --log_path="systemd" ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index e9030fc..fb3dd2c 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -16,7 +16,8 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= 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=rustdeskrelay --action="stop" --log_path="systemd" +ynh_systemd_action --service_name=rustdesksignal --action="stop" --log_path="systemd" #================================================= # "REBUILD" THE APP (DEPLOY NEW SOURCES, RERUN NPM BUILD...) @@ -43,9 +44,12 @@ ynh_script_progression --message="Upgrading system configurations related to $ap ynh_add_nginx_config -ynh_add_systemd_config +# Create a dedicated systemd config +ynh_add_systemd_config --service=rustdeskrelay --template=rustdeskrelay.service +ynh_add_systemd_config --service=rustdesksignal --template=rustdesksignal.service -yunohost service add $app --description="Remote control alternative for self-hosting" --log="/var/log/$app/$app.log" +yunohost service add rustdeskrelay --description="Rustdesk Relay Server" --log="/var/log/$app/$app.log" +yunohost service add rustdesksignal --description="Rustdesk Signal Server" --log="/var/log/$app/$app.log" #================================================= # RECONFIGURE THE APP (UPDATE CONF, APPLY MIGRATIONS...) @@ -64,7 +68,8 @@ yunohost service add $app --description="Remote control alternative for self-hos #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" +ynh_systemd_action --service_name=rustdeskrelay --action="start" --log_path="systemd" +ynh_systemd_action --service_name=rustdesksignal --action="start" --log_path="systemd" #================================================= # END OF SCRIPT