From 607b91ecdf69109b66c5ca913206d77cc70d2ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 20 Jun 2024 12:45:31 +0200 Subject: [PATCH] remove timeout --- scripts/change_url | 2 +- scripts/install | 4 ++-- scripts/restore | 2 +- scripts/upgrade | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 928c47c..ccce697 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -36,7 +36,7 @@ ynh_change_url_nginx_config ynh_script_progression --message="Starting a systemd service..." --weight=10 # Start a systemd service -ynh_systemd_action --service_name=$app --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120" +ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="/var/log/$app/etherpad.log" #================================================= # DEACTIVE MAINTENANCE MODE diff --git a/scripts/install b/scripts/install index c5d44a9..10841c2 100644 --- a/scripts/install +++ b/scripts/install @@ -147,7 +147,7 @@ ynh_use_logrotate --specific_user=$app/$app ynh_script_progression --message="Starting systemd service..." --weight=20 # Start a systemd service -ynh_systemd_action --service_name=$app --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120" +ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="/var/log/$app/etherpad.log" if [ $mypads -eq 1 ] then @@ -155,7 +155,7 @@ then ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "../conf/lang_mypads.sql" # Wait for etherpad to be fully started - ynh_systemd_action --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120" + ynh_systemd_action --action=restart --line_match="Your Etherpad version is" --log_path="/var/log/$app/etherpad.log" fi #================================================= diff --git a/scripts/restore b/scripts/restore index 1fcd245..a698cc2 100644 --- a/scripts/restore +++ b/scripts/restore @@ -65,7 +65,7 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./ #================================================= ynh_script_progression --message="Reloading NGINX web server and $app's service..." -ynh_systemd_action --service_name=$app --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120" +ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="/var/log/$app/etherpad.log" ynh_systemd_action --action=reload --service_name=nginx diff --git a/scripts/upgrade b/scripts/upgrade index 18ad54b..aa18c2d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -175,7 +175,7 @@ ynh_use_logrotate --non-append --specific_user=$app/$app #================================================= ynh_script_progression --message="Starting systemd service..." --weight=9 -ynh_systemd_action --service_name=$app --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120" +ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="/var/log/$app/etherpad.log" #================================================= # UPGRADE FAIL2BAN