From d1c64d43324448fd7bd2f6b3ab9eab427fc42e1d Mon Sep 17 00:00:00 2001 From: Max Kadel Date: Wed, 6 Nov 2024 14:23:45 -0500 Subject: [PATCH] Fix mailcatcher in staging - QA still seems broken, but I'm not sure if it's related - Trying to use a default value in common.yml did not work, because the value in production was always being used, not falling back to the default if it wasn't set in staging or qa - Needed to update the mailcatcher path --- group_vars/orangelight/common.yml | 4 ++-- group_vars/orangelight/qa.yml | 4 +++- group_vars/orangelight/staging.yml | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/group_vars/orangelight/common.yml b/group_vars/orangelight/common.yml index 3eddd2c6e..93c27eb8a 100644 --- a/group_vars/orangelight/common.yml +++ b/group_vars/orangelight/common.yml @@ -103,9 +103,9 @@ rails_app_vars: - name: SCSB_AUTH_KEY value: "{{ scsb_auth_key }}" - name: SMTP_HOST - value: "{{ ol_smtp_host | default('localhost') }}" + value: "{{ ol_smtp_host }}" - name: SMTP_PORT - value: "{{ ol_smtp_port | default('1025') }}" + value: "{{ ol_smtp_port }}" - name: SOLR_URL value: "http://{{ catalog_solr_host }}:8983/solr/{{ catalog_solr_collection }}" - name: CATALOG_FEEDBACK_QUEUE_ID diff --git a/group_vars/orangelight/qa.yml b/group_vars/orangelight/qa.yml index 98c8168b8..5e1ac6bd8 100644 --- a/group_vars/orangelight/qa.yml +++ b/group_vars/orangelight/qa.yml @@ -3,7 +3,9 @@ alma_read_write_key: "{{ vault_alma_read_write_key }}" install_mailcatcher: true mailcatcher_user: "pulsys" mailcatcher_group: "pulsys" -mailcatcher_install_location: "/usr/local/lib/ruby/gems/3.1.0/gems/mailcatcher-0.9.0/bin/mailcatcher" +mailcatcher_install_location: "/usr/local/lib/ruby/gems/3.1.0/gems/mailcatcher-0.10.0/bin/mailcatcher" +ol_smtp_host: 'localhost' +ol_smtp_port: 1025 ol_bibdata_base: 'https://bibdata-qa.princeton.edu' ol_clancy_api_key: "{{ vault_clancy_api_key }}" ol_clancy_base_url: '{{ vault_clancy_api_base_url }}' diff --git a/group_vars/orangelight/staging.yml b/group_vars/orangelight/staging.yml index 06710ae58..d7f365668 100644 --- a/group_vars/orangelight/staging.yml +++ b/group_vars/orangelight/staging.yml @@ -3,7 +3,9 @@ alma_read_write_key: "{{ vault_alma_sandbox_read_write_key }}" install_mailcatcher: true mailcatcher_user: "pulsys" mailcatcher_group: "pulsys" -mailcatcher_install_location: "/usr/local/lib/ruby/gems/3.1.0/gems/mailcatcher-0.9.0/bin/mailcatcher" +mailcatcher_install_location: "/usr/local/lib/ruby/gems/3.1.0/gems/mailcatcher-0.10.0/bin/mailcatcher" +ol_smtp_host: 'localhost' +ol_smtp_port: 1025 ol_bibdata_base: 'https://bibdata-staging.lib.princeton.edu' ol_clancy_api_key: "{{ vault_clancy_api_key }}" ol_clancy_base_url: '{{ vault_clancy_api_base_url }}'