Always use signal USR2 for puma with Redmine

alphanodes · Apr 24, 2024 · 45912c7 · 45912c7
1 parent 7f26522
commit 45912c7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/roles/gitlab/templates/etc/systemd/system/gitlab-puma.service.j2 b/roles/gitlab/templates/etc/systemd/system/gitlab-puma.service.j2
@@ -29,7 +29,7 @@ ExecStart={{ gitlab_gem_home }}/bin/bundle exec puma --config {{ gitlab_path }}/
 PIDFile={{ gitlab_pid_path }}/puma.pid
 Restart=on-failure
 RestartSec={{ gitlab_systemd_restart_sec }}
-ExecReload=/bin/kill -USR2 $MAINPID
+ExecReload=/usr/bin/kill -USR2 $MAINPID
 SyslogIdentifier=gitlab-puma
 Slice=gitlab.slice
 

diff --git a/roles/gitlab/templates/etc/systemd/system/gitlab-workhorse.service.j2 b/roles/gitlab/templates/etc/systemd/system/gitlab-workhorse.service.j2
@@ -21,7 +21,7 @@ ExecStart={{ gitlab_workhorse_path }}/gitlab-workhorse \
   -authSocket {{ gitlab_auth_socket }} \
   -documentRoot {{ gitlab_path }}/public \
   -secretPath {{ gitlab_path }}/.gitlab_workhorse_secret
-ExecReload=/bin/kill -USR2 $MAINPID
+ExecReload=/usr/bin/kill -USR2 $MAINPID
 Restart=on-failure
 RestartSec={{ gitlab_systemd_restart_sec }}
 SyslogIdentifier=gitlab-workhorse

diff --git a/roles/redmine/templates/etc/systemd/system/puma.service.j2 b/roles/redmine/templates/etc/systemd/system/puma.service.j2
@@ -26,10 +26,8 @@ ExecStart={{ redmine_home }}/.rvm/wrappers/default/bundle exec puma --config {{
 {% else %}
 Environment="GEM_HOME={{ redmine_ruby_system_gem_home }}"
 ExecStart={{ redmine_ruby_system_gem_home }}/bin/bundle exec puma --config {{ redmine_config_dir }}/puma.rb
-{% if active_puma_worker_killer|bool %}
-ExecReload=/bin/kill -USR2 $MAINPID
-{% endif %}
 {% endif %}
+ExecReload=/usr/bin/kill -USR2 $MAINPID
 SyslogIdentifier={{ puma_service_name }}
 Restart=on-failure
 RestartSec=30