From d03016ef1c4b40412b9de6fed02ae0e8bd3a491d Mon Sep 17 00:00:00 2001 From: Max Kadel Date: Thu, 28 Mar 2024 16:54:15 -0400 Subject: [PATCH 1/2] [bibdata] Preload passenger bundler Ensure we don't try to load multiple versions of a gem --- group_vars/bibdata/common.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/group_vars/bibdata/common.yml b/group_vars/bibdata/common.yml index 879f04fc0e..1e31a191e1 100644 --- a/group_vars/bibdata/common.yml +++ b/group_vars/bibdata/common.yml @@ -1,6 +1,8 @@ --- desired_nodejs_version: v18.19.1 passenger_ruby: "/usr/local/bin/ruby" +passenger_extra_http_config: + - "passenger_preload_bundler on;" install_ruby_from_source: true ruby_version_override: "ruby-3.1.0" bibdata_admin_netids: From 556c244cf1cb756ef60538e6078255a2c194684d Mon Sep 17 00:00:00 2001 From: Max Kadel Date: Thu, 28 Mar 2024 16:02:38 -0400 Subject: [PATCH 2/2] [bibdata] Ensure the condition only applies to one role - When working on something else, I found that, while the Passenger role was running on all machines, the *handler* to restart nginx was only running on the worker machines, because of this conditional. By wrapping the line in brackets, it ensures that the conditional is applied only to the sidekiq_worker role. Co-authored-by: Alicia Cozine --- playbooks/bibdata.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/playbooks/bibdata.yml b/playbooks/bibdata.yml index a63477d35d..e03a5aa26e 100644 --- a/playbooks/bibdata.yml +++ b/playbooks/bibdata.yml @@ -14,8 +14,7 @@ roles: - role: roles/bibdata - role: roles/bibdata_sqs_poller - - role: roles/sidekiq_worker - when: "'worker' in inventory_hostname" + - { role: roles/sidekiq_worker, when: "'worker' in inventory_hostname" } - role: 'hr_share' - role: roles/datadog when: runtime_env | default('staging') == "production"