Merge pull request #5719 from pulibrary/fix-mailcatcher-on-catalog-st…

…aging-and-qa
pulibrary · Jan 9, 2025 · 00513a9 · 00513a9
2 parents 36e1cee + 7d7fd74
commit 00513a9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/group_vars/orangelight/qa.yml b/group_vars/orangelight/qa.yml
@@ -4,7 +4,7 @@ install_mailcatcher: true
 mailcatcher_user: "pulsys"
 mailcatcher_group: "pulsys"
 mailcatcher_version: 0.10.0
-mailcatcher_install_location: "/usr/local/lib/ruby/gems/3.1.0/gems/mailcatcher-{{ mailcatcher_version }}/bin/mailcatcher"
+mailcatcher_install_location: "{{ global_gems_directory }}/mailcatcher-{{ mailcatcher_version }}/bin/mailcatcher"
 ol_smtp_host: 'localhost'
 ol_smtp_port: 1025
 ol_bibdata_base: 'https://bibdata-qa.princeton.edu'

diff --git a/group_vars/orangelight/staging.yml b/group_vars/orangelight/staging.yml
@@ -4,7 +4,7 @@ install_mailcatcher: true
 mailcatcher_user: "pulsys"
 mailcatcher_group: "pulsys"
 mailcatcher_version: 0.10.0
-mailcatcher_install_location: "/usr/local/lib/ruby/gems/3.1.0/gems/mailcatcher-{{ mailcatcher_version }}/bin/mailcatcher"
+mailcatcher_install_location: "{{ global_gems_directory }}/mailcatcher-{{ mailcatcher_version }}/bin/mailcatcher"
 ol_smtp_host: 'localhost'
 ol_smtp_port: 1025
 ol_bibdata_base: 'https://bibdata-staging.lib.princeton.edu'

diff --git a/roles/ruby_s/defaults/main.yml b/roles/ruby_s/defaults/main.yml
@@ -2,7 +2,9 @@
 # defaults file for roles/ruby_s
 ruby_version: "{{ ruby_version_override | default(ruby_version_default) }}"
 ruby_version_default: "ruby-3.1.3"
+ruby_minor_version: "{{ ruby_version | regex_search('ruby-([0-9]\\.[0-9])\\.[0-9]', '\\1') | first }}"
 ubuntu_ruby_version: "{{ ubuntu_ruby_version_override | default(ubuntu_ruby_version_default) }}"
 ubuntu_ruby_version_default: "ruby2.7"
 install_path: /opt/install
+global_gems_directory: "/usr/local/lib/ruby/gems/{{ ruby_minor_version }}.0/gems"
 ruby_yjit: false