From 8a4c1461173f2f806cbbb4dcf4b1a4a652b1492e Mon Sep 17 00:00:00 2001
From: Runar Ingebrigtsen <runar@rin.no>
Date: Tue, 27 Jan 2026 09:23:11 +0100
Subject: [PATCH] use rails credentials for smtp creds

---
 config/credentials.yml.enc        |  2 +-
 config/deploy.yml                 | 11 +----------
 config/environments/production.rb | 16 ++++++++--------
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc
index 377484e..7566ba7 100644
--- a/config/credentials.yml.enc
+++ b/config/credentials.yml.enc
@@ -1 +1 @@
-1frgw1tdeAMChiF5O/Lr3rhpz/EKVHFcl3fUFqpqRy6m31gTG4B58nR8FCm1rBujjNKZnGRvuGzxkw8rlwJKbSCtmFSQK3XIPQ5PW6XvL8n/9WVR9VBbSQxVQinXol+xp6tKHqUv6/fJRnIcvH0AR38tbeA4a6ByTG1bz62R0YVBCVdPkvB9QvS0TIy4Ks04YTJQvi/WIuBzQ0/2++v9rO9KLlabhDwLnOTYrjRgewlFAIlI8IlRZr6NO3m4yq6LTXD8gJ9rjXLE8Ajh9BFShlXXgAXXN0UsfetSseROvCYXhsFZAAR9pIX65zh8+edtxREmFL2yTXzNwTNpUq788VLGiHBK6mQQxviZGi4URj5zfZ+piXU3GWYcpU3txNGG0vVZYhyvs2sSFk+CQnmFojCuvvq9oNjrtTgE1yi/17SNq93YG7E7m+sFh2Jmc3cN04SPv7XLixKzFAK9028M7uQZvOC6R7Pb2DySvTILbe56CDCvBiTpTCB2--hkQcz/vYM834FRs4--BcXqGn/gjm7peH3bOzjLdA==
\ No newline at end of file
+zpoeMDGo2CLBHgcz2LO7FiMDUmMsm7mRbAnNgQEr/WyNVm911SijFO18+Plqi4mchodCjPsGQhJO2oje4HZszu55z2TiHNRqMdqrQ5fDRonLF9BNC+W0E3hhz+kJiL/RS5bSPSOsoNlNfeztfD1lQs+nLV2v385GiTlayA3Wj2WMaLDUGcHCKjOWVvsRZp1oozECkh1kNw8TWjencpBFjk+YSAdpZKQFvEkYVsmsmN5+RC2ltBAUDAiCYHWeb9Sku2hCwxs8MDzCAutvR011vWnbgIebU3AE9jn1QkVOVYgvoGXH0Ni7wtcvPYzXF4Pop/GuUZwMCHNzUltSYZbft7MioAZdIPB9rg44yeUgrVHrVcmGbo8ZuDqGKUesrRKd5wBge6xPaxeBMmWVlW9OW0Ny0KQl5rHVmooRkW5wkpu5Dlcc45EkZ1/GyMVpLL3G+T1itRBi1Tj2YqxPxYwcQ3tAG5JjPzl2zvnleU9sNTfvw1eKy502uvHHiBCNYoaCv/NjKHvmBjhN8QDKCWyjKB+oyA==--NDjJNqjXxGKVKpyO--Q0I4O9nbNMl9VouDurQP3A==
\ No newline at end of file
diff --git a/config/deploy.yml b/config/deploy.yml
index 80b24ff..7dc66b8 100644
--- a/config/deploy.yml
+++ b/config/deploy.yml
@@ -2,7 +2,7 @@
 service: sanasto-wiki
 
 # Name of the container image.
-image: your-username/sanasto-wiki
+image: soverein/sanasto-wiki
 
 # Deploy to these servers.
 servers:
@@ -42,17 +42,8 @@ env:
     RAILS_LOG_TO_STDOUT: true
     RAILS_SERVE_STATIC_FILES: true
     SOLID_QUEUE_IN_PUMA: true
-
-    # Mail server config
-    SMTP_ADDRESS: mail.soverein.no
-    SMTP_PORT: 587
-    SMTP_DOMAIN: frostshipdesign.no
-    SMTP_AUTHENTICATION: plain
-    SMTP_ENABLE_STARTTLS_AUTO: true
   secret:
     - RAILS_MASTER_KEY
-    - SMTP_USERNAME
-    - SMTP_PASSWORD
 
 # Use persistent storage volume for SQLite database and uploads
 volumes:
diff --git a/config/environments/production.rb b/config/environments/production.rb
index cb0241d..128eb93 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -57,16 +57,16 @@ Rails.application.configure do
   # config.action_mailer.raise_delivery_errors = false
 
   # Set host to be used by links generated in mailer templates.
-  config.action_mailer.default_url_options = { host: "example.com" }
+  config.action_mailer.default_url_options = { host: "sanasto.rin.no" }
 
   # 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: "smtp.example.com",
-  #   port: 587,
-  #   authentication: :plain
-  # }
+  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",
+    port: 587,
+    authentication: :plain
+  }
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).