diff --git a/scripts/backup b/scripts/backup index b77b5e3..ccef97b 100644 --- a/scripts/backup +++ b/scripts/backup @@ -59,7 +59,7 @@ ynh_backup --src_path="/etc/systemd/system/$app.service" #================================================= # BACKUP THE DATA DIRECTORY #================================================= -ynh_script_progression --message="Backing up data directory..." +ynh_print_info --message="Backing up data directory..." ynh_backup --src_path="$sync_home" --is_big diff --git a/scripts/install b/scripts/install index 75c0984..10a1496 100644 --- a/scripts/install +++ b/scripts/install @@ -162,7 +162,7 @@ chown -R $app: $final_path #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "$app daemon for Syncthing" --log_type "systemd" +yunohost service add $app --description "$app daemon for Syncthing" --needs_exposed_ports $sync_port #================================================= # START SYSTEMD SERVICE diff --git a/scripts/restore b/scripts/restore index 6d438b7..b51c5ca 100644 --- a/scripts/restore +++ b/scripts/restore @@ -31,6 +31,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) sync_home=$(ynh_app_setting_get --app=$app --key=sync_home) +sync_port=$(ynh_app_setting_get --app=$app --key=sync_port) #================================================= # CHECK IF THE APP CAN BE RESTORED @@ -44,6 +45,14 @@ test ! -d $final_path \ #================================================= # STANDARD RESTORATION STEPS +#================================================= +# OPEN A PORT +#================================================= +ynh_script_progression --message="Configuring firewall..." + +# Open the port +ynh_exec_warn_less yunohost firewall allow TCP $sync_port + #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= @@ -91,14 +100,14 @@ chown -R "$app": "$sync_home" ynh_script_progression --message="Restoring the systemd configuration..." ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -systemctl enable $app.service +systemctl enable $app.service --quiet #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "$app daemon for Syncthing" --log_type "systemd" +yunohost service add $app --description "$app daemon for Syncthing" --needs_exposed_ports $sync_port #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index 511612e..96ad24e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -71,7 +71,7 @@ if [ -z $gui_port ]; then systemctl stop syncthing@$OLD_SYNCUSER.service yunohost service remove syncthing@$OLD_SYNCUSER.service - systemctl disable syncthing@$OLD_SYNCUSER.service + systemctl disable syncthing@$OLD_SYNCUSER.service --quiet ynh_secure_remove --file="/etc/apt/sources.list.d/syncthing.list" @@ -180,7 +180,7 @@ ynh_add_systemd_config #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "$app daemon for Syncthing" --log_type "systemd" +yunohost service add $app --description "$app daemon for Syncthing" --needs_exposed_ports $sync_port #================================================= # GENERIC FINALIZATION