diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb index 3c34c81..4b33a6e 100644 --- a/app/mailers/application_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -1,4 +1,4 @@ class ApplicationMailer < ActionMailer::Base - default from: "from@example.com" + default from: Rails.application.credentials.dig(:mail, :from) layout "mailer" end diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc index f579a5d..c02fc0e 100644 --- a/config/credentials.yml.enc +++ b/config/credentials.yml.enc @@ -1 +1 @@ -VW/9NBoQ4zLQpN8kEMD5fvUTGMGrLlzk62WmbzIc93ucs0VYsPnq8y3IqH52d6BY/QyMdUcTOFKzjL2cEfP/BCtuwhYsOlxEuiaG81H2eFYW22iKIRXF2vc5xoYtBsGz17GI8iMn30JaxXyg/FZ69apPjPMHmri8kABAQyW0eBLb37oIX+gIfxtMnlXuQEoCF2et0JHwMdcLok6LrAeuG9xP4ewOxY+izlM8aSlVxlApi4UuErdrSAdkFCnDy/ezR4/GcPBW3fHq3lTA//AFsBaHqT7Fj6YymBPiaQBBV+zXd1PzWp8G4q7iAjf0MLZ4EsUDTXxPEKRFdQRgUltjIbQHjGLXxGd0jhvkjcuHlvfc0TLstY4+4kNLSzmHj8R4LGNfKRDxN9GRkANxeGn5J2bLz2zbrMORooG1IIqMlcaHkK5m2uhQnX3RlIWWXMihmAWd6VUOXv7VdeAkSjsJfCrm2RSMmHebbFyFCFX/czZcXEsZXT7A10epGXSCE8s6FL/1y8Tr4VyC5ZIA7zwL8w==--8GX6EM6L+OOLjAf1--1tWgT0jvjP1O3p+Nm/0iow== \ No newline at end of file +JC3W3xoTxCvfRD1b4tx56WaFXVOpIE0Vfnd0Pt6KUiCEYgMIcPi5KXYKWGsUIZG3PgWOx4BhZ1HR1TXfm/kB7o1fVdPuiLeWpf+3JKwjg9dU1GBwPSwpH4t4uRgWPAE48h6WCkcy22gRuCWr3LmPcZa3EV7u9tZwjWDwOS/RW2FZkkOu7HGFQKwwcGZKVy0TF6hXxGfJEZMLF+5kWgjii2a1VAI0Dy53UBwlxQ+hSilYlkAEQTYmuRzCUExjQuPB77vdZZb/Fumuqp6GrP8xubczunzaePAmv5EBREUy3xfV71/hwDwZFZDCRQQ4PbVBlTYh/3upfUtjOtG2amnqwOGq2oWP1sFVNZy6ZyicMTTjrVf7oh96vR+tHr3OBg+ZEjYS9nHhUUyUv/OjXh35nHQRH0zbbGqCTngOpyOa6IRZuC83bybNQ3+qXY9lau22LoIc8sxJdSHLQ8ZMEXPYm5f8mo3xTJ0SlY8/3QGW0VcWrEp63gqP0k/3GuoHJbjGWT08kFgh8ynAOaORZyZdVkCdS3KbUeyiNdQV0UgowqwBz4cj9pWQGjY3zU0ngTyTD9fIZ6cfyjDpWHPaXeol+X8=--Jl8cRsZDKG3chvBd--MG6KloWhjRJgvvY/pq/fHQ== \ No newline at end of file diff --git a/config/deploy.yml b/config/deploy.yml index 5d2f461..7dc66b8 100644 --- a/config/deploy.yml +++ b/config/deploy.yml @@ -48,7 +48,6 @@ env: # Use persistent storage volume for SQLite database and uploads volumes: - "sanasto_storage:/rails/storage" - - "sanasto_db:/rails/db" # Bridge fingerprinted assets between versions asset_path: /rails/public/assets diff --git a/config/environments/production.rb b/config/environments/production.rb index 7d39180..58c7d08 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -62,9 +62,9 @@ Rails.application.configure do # Specify outgoing SMTP server. Remember to add smtp/* credentials via bin/rails credentials:edit. config.action_mailer.smtp_settings = { - user_name: Rails.application.credentials.dig(:smtp, :user_name), - password: Rails.application.credentials.dig(:smtp, :password), - address: "mail.soverein.no", + user_name: Rails.application.credentials.dig(:mail, :username), + password: Rails.application.credentials.dig(:mail, :password), + address: Rails.application.credentials.dig(:mail, :smtp_server), port: 587, authentication: :plain }