Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

i1023/i1005 - set up maildev for staging #2199

Merged
merged 7 commits into from
May 1, 2024
Merged

i1023/i1005 - set up maildev for staging #2199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1d8b975
i1023 - set up maildev for staging
ShanaLMoore May 1, 2024
64fc360
Merge branch 'main' into i1005-setup-email-notifications
ShanaLMoore May 1, 2024
7ab805e
Merge branch 'main' into i1005-setup-email-notifications
ShanaLMoore May 1, 2024
d52758b
Merge branch 'i1005-setup-email-notifications' of https://github.com/…
ShanaLMoore May 1, 2024
f1fe2b6
update demo and staging deploy files
ShanaLMoore May 1, 2024
a30dd11
add test mailer
ShanaLMoore May 1, 2024
badbfd7
♻️ Revert changes after testing confirmation
ShanaLMoore May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion config/environments/production.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,15 @@
config.active_job.queue_adapter = ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq')
# config.active_job.queue_name_prefix = "hyku_#{Rails.env}"

config.action_mailer.default_options = { from: ENV.fetch('HYKU_CONTACT_EMAIL', '[email protected]') }
if ENV['SMTP_ENABLED'].present? && ENV['SMTP_ENABLED'].to_s == 'true'
config.action_mailer.smtp_settings = {
user_name: ENV['SMTP_USER_NAME'],
password: ENV['SMTP_PASSWORD'],
address: ENV['SMTP_ADDRESS'],
domain: ENV['SMTP_DOMAIN'],
port: ENV['SMTP_PORT'],
enable_starttls_auto: true,
enable_starttls_auto: ActiveModel::Type::Boolean.new.cast(ENV.fetch('SMTP_STARTTLS', true)),
authentication: ENV['SMTP_TYPE']
}
# ActionMailer Config
Expand Down
20 changes: 11 additions & 9 deletions ops/demo-deploy.tmpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,20 +141,22 @@ extraEnvVars: &envVars
value: hyku-demo.$BASE_URL
- name: HYKU_USER_DEFAULT_PASSWORD
value: password
- name: SMTP_ADDRESS
value: "maildev-smtp.maildev.svc.cluster.local"
- name: SMTP_DOMAIN
value: "maildev-smtp.maildev.svc.cluster.local"
- name: SMTP_ENABLED
value: "true"
- name: SMTP_PORT
value: "1025"
- name: SMTP_TYPE
value: "plain"
- name: SMTP_USER_NAME
value: $SMTP_USER_NAME
value: "admin"
- name: SMTP_STARTTLS
value: "false"
- name: SMTP_PASSWORD
value: $SMTP_PASSWORD
- name: SMTP_ADDRESS
value: smtp.mailtrap.io
- name: SMTP_DOMAIN
value: smtp.mailtrap.io
- name: SMTP_PORT
value: "2525"
- name: SMTP_TYPE
value: cram_md5
- name: SOLR_ADMIN_USER
value: admin
- name: SOLR_ADMIN_PASSWORD
Expand Down
20 changes: 11 additions & 9 deletions ops/staging-deploy.tmpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,20 +143,22 @@ extraEnvVars: &envVars
value: password
- name: NEGATIVE_CAPTCHA_SECRET
value: $NEGATIVE_CAPTCHA_SECRET
- name: SMTP_ADDRESS
value: "maildev-smtp.maildev.svc.cluster.local"
- name: SMTP_DOMAIN
value: "maildev-smtp.maildev.svc.cluster.local"
- name: SMTP_ENABLED
value: "true"
- name: SMTP_PORT
value: "1025"
- name: SMTP_TYPE
value: "plain"
- name: SMTP_USER_NAME
value: $SMTP_USER_NAME
value: "admin"
- name: SMTP_STARTTLS
value: "false"
- name: SMTP_PASSWORD
value: $SMTP_PASSWORD
- name: SMTP_ADDRESS
value: smtp.mailtrap.io
- name: SMTP_DOMAIN
value: smtp.mailtrap.io
- name: SMTP_PORT
value: "2525"
- name: SMTP_TYPE
value: cram_md5
- name: SOLR_ADMIN_USER
value: admin
- name: SOLR_ADMIN_PASSWORD
Expand Down
Loading