diff --git a/config/environments/development.rb b/config/environments/development.rb index f4a0edf..947248d 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -44,7 +44,7 @@ Rails.application.configure do config.action_mailer.smtp_settings = { address: 'asmtp.bluepipe.dk', port: 587, - domain: 'ikea-foundation-week-2025.onc.dk', + domain: 'completesentences.ikeafoundation.org', authentication: :login, user_name: 'oncotype@oncotype.dk', password: 'y9usn&rpErwY' diff --git a/config/environments/production.rb b/config/environments/production.rb index 31e7e5d..1ab16d2 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -59,12 +59,12 @@ Rails.application.configure do config.action_mailer.delivery_method = :smtp # Set host to be used by links generated in mailer templates. - config.action_mailer.default_url_options = { host: 'ikea-foundation-week-2025.onc.dk', protocol: 'https' } + config.action_mailer.default_url_options = { host: 'completesentences.ikeafoundation.org', protocol: 'https' } config.action_mailer.smtp_settings = { address: 'smtp.bluepipe.net', port: 25, - domain: 'ikea-foundation-week-2025.onc.dk' + domain: 'completesentences.ikeafoundation.org' } # Specify outgoing SMTP server. Remember to add smtp/* credentials via rails credentials:edit. diff --git a/config/initializers/premailer_rails.rb b/config/initializers/premailer_rails.rb index 7ee7fc4..64b9128 100644 --- a/config/initializers/premailer_rails.rb +++ b/config/initializers/premailer_rails.rb @@ -4,5 +4,5 @@ Premailer::Rails.config.merge!( input_encoding: 'UTF-8', generate_text_part: true, strategies: [:filesystem, :asset_pipeline, :network], - base_url: (Rails.env.production? ? 'ikea-foundation-week-2025.onc.dk' : 'https://gw.oncotype.dk') + base_url: (Rails.env.production? ? 'completesentences.ikeafoundation.org' : 'https://gw.oncotype.dk') ) diff --git a/config/locales/en.yml b/config/locales/en.yml index 5cf2a75..09ff0cd 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,5 +1,5 @@ en: - domain: ikea-foundation-week-2025.onc.dk + domain: completesentences.ikeafoundation.org project_name: IKEA Foundation Week 2025 client_name: IKEA Foundation diff --git a/config/nginx.conf b/config/nginx.conf index 33826c6..cef7a85 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -16,25 +16,25 @@ server { } # # https -# server { -# listen 443 ssl; -# http2 on; -# -# server_name ikea-foundation-week-2025.onc.dk; -# -# # keepalive_timeout 300; -# keepalive_timeout 5; -# client_max_body_size 4G; -# -# ssl_certificate /etc/letsencrypt/live/ikea-foundation-week-2025.onc.dk/fullchain.pem; # managed by Certbot -# ssl_certificate_key /etc/letsencrypt/live/ikea-foundation-week-2025.onc.dk/privkey.pem; # managed by Certbot -# include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot -# ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot -# -# location / { -# return 301 https://spotlinks.ikeafoundation.org$request_uri; -# } -# } +server { + listen 443 ssl; + http2 on; + + server_name ikea-foundation-week-2025.onc.dk; + + # keepalive_timeout 300; + keepalive_timeout 5; + client_max_body_size 4G; + + ssl_certificate /etc/letsencrypt/live/ikea-foundation-week-2025.onc.dk/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/ikea-foundation-week-2025.onc.dk/privkey.pem; # managed by Certbot + include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot + ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot + + location / { + return 301 https://completesentences.ikeafoundation.org$request_uri; + } +} # # http > https # server { @@ -66,7 +66,7 @@ server { http2 on; # server_name spotlinks.ikeafoundation.org; - server_name ikea-foundation-week-2025.onc.dk; + server_name completesentences.ikeafoundation.org; # keepalive_timeout 300; keepalive_timeout 5; @@ -75,8 +75,8 @@ server { # ssl_certificate /etc/letsencrypt/live/spotlinks.ikeafoundation.org/fullchain.pem; # managed by Certbot # ssl_certificate_key /etc/letsencrypt/live/spotlinks.ikeafoundation.org/privkey.pem; # managed by Certbot - ssl_certificate /etc/letsencrypt/live/ikea-foundation-week-2025.onc.dk/fullchain.pem; # managed by Certbot - ssl_certificate_key /etc/letsencrypt/live/ikea-foundation-week-2025.onc.dk/privkey.pem; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/completesentences.ikeafoundation.org/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/completesentences.ikeafoundation.org/privkey.pem; # managed by Certbot include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot