From 7fb106d35a09ab6cf064197a08f09a429248b1f5 Mon Sep 17 00:00:00 2001 From: kay0u Date: Wed, 19 Jun 2019 19:05:08 +0200 Subject: [PATCH 1/3] change timeout and restart gitlab service --- scripts/change_url | 2 +- scripts/install | 7 +++++++ scripts/restore | 2 +- scripts/upgrade | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index c27647c..b30f1e3 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -124,7 +124,7 @@ gitlab-ctl reconfigure #================================================= ynh_script_progression --message="Waiting for gitlab..." --weight=15 -ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=3600 +ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=300 #================================================= # GENERIC FINALISATION diff --git a/scripts/install b/scripts/install index 581c163..d61c717 100644 --- a/scripts/install +++ b/scripts/install @@ -249,6 +249,13 @@ ynh_script_progression --message="Reloading nginx web server..." --weight=1 ynh_systemd_action --action=reload --service_name=nginx +#================================================= +# RESTART GITLAB +#================================================= +ynh_script_progression --message="Restarting gitlab..." --weight=15 + +ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=300 + #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index d2f1aa9..1b9c9ca 100644 --- a/scripts/restore +++ b/scripts/restore @@ -156,7 +156,7 @@ yunohost service add "gitlab-runsvdir" --log "/var/log/$app/gitlab-rails/applica #================================================= ynh_script_progression --message="Waiting for gitlab..." --weight=14 -ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=3600 +ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=300 #================================================= # CHECK THE RESTORED DATA diff --git a/scripts/upgrade b/scripts/upgrade index 490e11a..545f478 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -303,7 +303,7 @@ then ynh_script_progression --message="Waiting for gitlab..." --weight=15 # Action status to just wait the service - ynh_systemd_action --action=status --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=3600 + ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=300 fi #================================================= From dd4341954cd9d07894811ff6523dd79b30606a22 Mon Sep 17 00:00:00 2001 From: Kayou Date: Wed, 19 Jun 2019 20:05:52 +0200 Subject: [PATCH 2/3] Remove comment --- scripts/upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 545f478..c09442e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -302,7 +302,6 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Waiting for gitlab..." --weight=15 - # Action status to just wait the service ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=300 fi From 6d9f1de378190c1c9c3dcc348f135f54b24fd9ec Mon Sep 17 00:00:00 2001 From: Kayou Date: Fri, 21 Jun 2019 09:30:32 +0200 Subject: [PATCH 3/3] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index c09442e..2f1e300 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -300,7 +300,7 @@ fi if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Waiting for gitlab..." --weight=15 + ynh_script_progression --message="Restarting gitlab..." --weight=15 ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=300 fi