diff --git a/.github/workflows/azure-deploy-dev.yml b/.github/workflows/azure-deploy-dev.yml
index 4eaa95a68..6d99febc8 100644
--- a/.github/workflows/azure-deploy-dev.yml
+++ b/.github/workflows/azure-deploy-dev.yml
@@ -5,6 +5,7 @@ on:
push:
branches:
- main
+ - er-signup-url
paths-ignore:
- '**/*.md'
- .docker*
diff --git a/app/constraints/cms_route_constraint.rb b/app/constraints/cms_route_constraint.rb
deleted file mode 100644
index db14b2fb7..000000000
--- a/app/constraints/cms_route_constraint.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# app/constraints/cms_route_constraint.rb
-
-# In production (on a CloudFoundary server), disable the
-# cms and devise routes unless the subdomain contains
-# the string 'cms'
-class CmsRouteConstraint
- def matches?(request)
- if Rails.env.production?
- /.*cms.*/.match request.subdomain
- else
- true
- end
- end
-end
diff --git a/app/views/layouts/_analytics_body.html.erb b/app/views/layouts/_analytics_body.html.erb
index 1e6da317c..715705252 100644
--- a/app/views/layouts/_analytics_body.html.erb
+++ b/app/views/layouts/_analytics_body.html.erb
@@ -1,6 +1,6 @@
diff --git a/app/views/layouts/_analytics_header.html.erb b/app/views/layouts/_analytics_header.html.erb
index da94e6538..afe8256ef 100644
--- a/app/views/layouts/_analytics_header.html.erb
+++ b/app/views/layouts/_analytics_header.html.erb
@@ -1,9 +1,9 @@
-
+
\ No newline at end of file
diff --git a/config/application.rb b/config/application.rb
index 7b2cf46f8..df5daa48f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -26,8 +26,7 @@
module GovukRailsBoilerplate
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
- config.load_defaults 6.0
- config.autoloader = :classic
+ config.load_defaults 6.1
# Settings in config/environments/* take precedence over those specified here.
# Application configuration can go into files in config/initializers
@@ -43,13 +42,12 @@ class Application < Rails::Application
config.middleware.use Rack::RejectTrace
config.middleware.use Rack::Deflater
- subdomain = ENV.fetch('DOMAIN', "eyfs-dev").split(".").first
- allowed_spaces = %w[eyfs-dev eyfs-pre-prod eyfs-prod eyfs-sandbox eyfs-test]
- config.space = allowed_spaces.include?(subdomain) ? subdomain : "eyfs-dev"
config.i18n.load_path += Dir[Rails.root.join('config', 'locales', 'content', '*.{rb,yml}').to_s]
- config.feedback_url = ENV.fetch('FEEDBACK_URL', '#FEEDBACK_URL_env_var_missing')
- config.signup_url = ENV.fetch('SIGNUP_URL', '#SIGNUP_env_var_missing')
+ config.feedback_url = ENV.fetch('FEEDBACK_URL', config_for(:configuration)['feedback_url'] || '#FEEDBACK_env_var_missing')
+ config.signup_url = ENV.fetch('SIGNUP_URL', config_for(:configuration)['signup_url'] || '#SIGNUP_env_var_missing')
+ config.tracking_id = ENV.fetch('TRACKING_ID', config_for(:configuration)['tracking_id'] || '#TRACKING_ID_env_var_missing')
+ config.js_url = "https://www.googletagmanager.com/ns.html?id=#{config.tracking_id}"
end
end
diff --git a/config/configuration.yml b/config/configuration.yml
new file mode 100644
index 000000000..44ffb1575
--- /dev/null
+++ b/config/configuration.yml
@@ -0,0 +1,7 @@
+shared:
+ tracking_id: G-2YJFCCJ520
+ feedback_url: https://forms.office.com/Pages/ResponsePage.aspx?id=yXfS-grGoU2187O4s0qC-a1INvUBHVZElO6Xg1Rw2V9UM1pQNEtCN0YyVVdFVkpOUVNXNUlZNTdOUCQlQCN0PWcu
+ signup_url: https://forms.office.com.mcas.ms/Pages/ResponsePage.aspx?id=yXfS-grGoU2187O4s0qC-a1INvUBHVZElO6Xg1Rw2V9UQlg3SlFPTVZIRlFaVDY5MzJQQUxQTk0yQyQlQCN0PWcu
+
+production:
+ tracking_id: G-WRRWDTSGBP
diff --git a/config/credentials/deployed_development.yml.enc b/config/credentials/deployed_development.yml.enc
deleted file mode 100644
index aea9f8fea..000000000
--- a/config/credentials/deployed_development.yml.enc
+++ /dev/null
@@ -1 +0,0 @@
-fodNdI3oCSMEqUKBMrEA4OAmG1d2ltwDNu1/pvBtCYh7qtONZRZzYBfzroM91oqYBtTfX3DLbtO3gWBs3o7VF10fCInASo+loRnKIrde5Zqy9lxWegoeH8FzU2Wv/LZS+ft8OGqO2u0XEAvXgMH+eiFE87yUSYX8mmA2p5st1qvOs0i+cZNeeUHwe7CT45uOE7ykf/n7jgkPVon4sdizooAeT9SxBI0EuVQOga/Y22dnyh4mAIow0VpQA+JbAc1rocO2HZ7XQtG7d9TYDHUaQyACKtFhk22VijkguYIRUFaIpdeLlXD8/Rp6y/PZm3uNCcxnKWC466oHw1jIP1bBa3Q/MBFCZ8JylLsCrpW8BSviRkYJRrHrMx4dOpxqkl4qcgItk4c6FbJTCalUHnP6k2T7W+c0gwX32qqXZEkJrVuGanMk/rZMq7uMpDG+VqB9k6TtdnJb+3jPDMq0MVUSUCkWXfqcrm+GFlRJdSJiDZ5jVGUmdCCj3Uau/HLQzJHXBZwWbfCM0XyVXfXeGfRoOHSQyggl8A7czR1iGk8siIY8WNCmuaNPC8+gtfirk2AWiwlGNfr+0htJeFN1azyWspJ16jAFXy7HITBQHA0eB8VJ9jOzlSWZokewy8VvZDlU7r/dSrHn9mY5p6KUiCgvzc+pdrmcAvAZTXGCXVrOzwWtbKUZdUTMUPRIdw5r1lToNlfPeTpjktlfNtShK1LfchR9HEZXjBeLoL0DiR9CJwQKm88k6l4kjaGCu5CkO7LbXEH1oOHbmQf2Ni6ETA/gtKUaGsPVaVDynZLFQDa067tmcasADi0tJ0WXao3uByrh3hGdQED3nlFGn1Ww6ICgXGS5nsoKaD4AtlikwvIYwD1FKgkqOD+FRutXJBnuLIJNpnBRtQ1/Q6FooVv3OIaOdL8D8rs/aDpVpKnr1XRLcvCQVSG4H4jDnR/v1udlzqAUmg7C4c5x9Nb/VetoTIcS347KHgqr64NtlZyqCUcLFmrgei7AwcJFciQ1dHr/woBs0RuJbr9m0pxhKFSOoXCF6hfIYIzKNCrHvrrJwbYrnAPHRJS8TA9bwg==--kafRKnfrItWg+eq5--Ro68IjsavGQQ09E6KpJrXw==
\ No newline at end of file
diff --git a/config/credentials/development.yml.enc b/config/credentials/development.yml.enc
index ecb31ad97..2f12f59d9 100644
--- a/config/credentials/development.yml.enc
+++ b/config/credentials/development.yml.enc
@@ -1 +1 @@
-BVeMLef6JCIIqlPUpzcJ3d1UlPOXLGiRXaPEIvSlhQf8UlyCYYnf3LXBGC4jXlxgHmdtNR2Q9m335zS+x9Jx3MDdJG/ca37IMGcUlhZqHLeE/WIjAcHF1eixV8p6JwvmcUgnAqm96/VwVQbbgywdUfhdTvvxAHQcArxUZsyKlPfZiXvElcirK43TzOzP/+sV4zpVWhtasHZbltRNzERLYmmgG1Lj3k3M4Xuym562NlQlEzm9RDuRsmb7K1Q1XZn+gmERcyiJyt5UAbu8d5TO8zGs5C3WGaa6OLNn3MAGNSyTTkSm1jhhqRX54ai8RQ93yccdBaUsj+8QAi4Qm+UQWDx1iQ5oW4j/aYShFz9ZhXVAU1ViMHfepx6W7IKM1trH4C0oHRjo3hYqdagP6bxYpoNkOBlTusSr+xmtQ9EkXeoKLiotLYzjx1evrd63fTRT4qRN2zfcjQvk3joOLgGKSB/ruRBWJ90RWNRqG/xuHjzgvn4b4BrP0zzOge+X2OpND02ab//XlqcgTAGM6K+ph7qSpoJ5Gs5+GJX1wnfQHaCDj6y/BufRD7FicH1sPku7E0fZD6QzNqV2y7B9rklVQaG3A/WnjiEJA8NJSKiS5Ihp4RQSWGno2m/+7KolU05P3qsl5Xv+KMYakBnWLFLBc6LuK95clRJAT6G0ivDVzXfiHZ/WsBx56nqmd5gb64ZnsQGvw3+tOKQ16iZ2yhAsuR/4FZuchgHx99OkGCwoQfSdHaxMsUh1vzQjZAfzZb5mrITOwXrd1PSrtMNMhadi5LqE6VuBut3ePtANbNLCQBsTTOS5g4g2s9i+S4gDeufCdzW10SvdQSj7hCGYCfVnEKVqJ53N2nbGi3erqA9KFF0BpR2R8FnMswMzWDui7kcvw0t36QOyqdr+zeryXfICB71mbv6ARaqU0kBEjcRPNbvVm8n242zJfSiiQKse9rSW1oTvV35rtnHgodtnMXo/LcRi9e2E5Fg/hnU+3EYEIgBQAO8uJQDtoHWf7wp8BUWWNSlEsaAfLemjekv0BJeR7AxlhxQsG/KDIRNY9ySE90sV--awI3U18bYsjG2pmZ--cKAkmA7tTp1oISJdX4qemQ==
\ No newline at end of file
+avjCEifWw7XonVxY+AP8YzeN/D6WI77QcbJ8Ii9s3MilHONBiBy8qAFNaep/2hqhCn0swmaC/wBLf+79xwtbp3kYfEE6C3PPc6TY/txndc51b1uNd0sNmEN40X+GS33jWH8KjaJm5+xVkt5BL0FcgKc+ANOv7ohGXJKi42En2Ug+G+nRhYQQToirjXYE+1KtEZDUC8ER4/X3wf0xbETzQsVhR2EaEGQ30/JrjZXoL4T1lbcr7wro7TFVtAmG0q6M0LpMBhWKDATXyOYVfFOWn3Vfi2Z1+H1BK+XYxJ+nzaNje0xTs30SRXpftO+rnbHWdHTSpLHxBF89vtznmZU34zqYFnJg0YmXf+2WPOL9/5YDMl/niOLc6WVArPm4/sJ7wBcWDj21mFcgpMXupQ/7RI+TnphbyNoXypZIjCfUuK3xtNKTZWMpMYGxXy3NH/ROqd/U0S1pC6W5M/vaJNEVY0qd60nBRyWRccu8+IJs0xulGYp3Nn6kQLLXByxhHzyLBojfyQv2gRbLBuhjIabGmOOY/5ZsDrtSPoxrkzCVUKsne7lC4G+eoj2DF2S3DPj2ZdVzeBnY8VGLfXYUU0DX4AKg+D2cV+RR/1nfIN2e8vGwBMzMpxJdUzw/oRg1h8Cxdt2qa8HA/J4=--1z6I1nltBZHkciFk--Y+MsuSztkBDgaR+/hCqthQ==
\ No newline at end of file
diff --git a/config/credentials/sandbox.yml.enc b/config/credentials/sandbox.yml.enc
deleted file mode 100644
index 79e1e0cb8..000000000
--- a/config/credentials/sandbox.yml.enc
+++ /dev/null
@@ -1 +0,0 @@
-ivTSGnf6/3PVuKP0GAqmIsEztimVVICr/sp8CgMOowMItEuMiHlMFeoQolXjcHUkW4yLh6q0DLGEBIT3ZjFmQJcTz10=--ky38f1P8Ox5+tsiB--pkMraRAop8BZWNBee4trGQ==
\ No newline at end of file
diff --git a/config/credentials/staging.yml.enc b/config/credentials/staging.yml.enc
deleted file mode 100644
index e4478c542..000000000
--- a/config/credentials/staging.yml.enc
+++ /dev/null
@@ -1 +0,0 @@
-sH6rNjcUHGY6tUpUKjzYPuX4xXc7BTWurXfgz6LBQ+bI6ukGPJWr+8iaez5V+DiF3xlHeGQm365hoOtewmAMzzwptaRCHU/ZdjuwFUIlBi78fm/anPP4YYeokazjl9lRW+hkNW4+cwdRtwuu3VYTGumulQ+nRdLPQwAzdNsNDpYrZzWs658HXkh640YqezN0qPkTOD+6gQmgevK4J9RgN3SYS7V373cAHQSSPVBolKeCRfY+mEDoqXsXInfihinQJjTaeqYOciB8SqnAfDCunTrDtZ+bVEoTZP5FKhReAJC9ps/qgezJ+cvrH0e+IVcotQ6h7XYiCG582vWKxJjMR9PXS6uI7TRxwLprSYv03Sak85MRgo87DABc0pw1wzHey6VqkYrwaFuBHkP0puMhYsCwnUDDJoZn41g5OjG6GCc6v6t5agjKcKtyrvqBqW4LMeAAkdM2GpScyE+igxPJ4RrHds4oMNM8Rfxz4y+tYp+1IDI9FrnzXYfUER1GR1i3t0Ix6HLyDbry+EA03RIMZSlR0j4xm51YM6HYPKSGhfHDXGHK9+z52NhJU9udGBEZ8rz9IDr3DNGlNG+IQMg+mUnad7pEFCFDzMwQvM1RO7+AHIpQ+UMuZfHFHIwkU0p26YEgPLFFCiig2JMT8sJMc5Cj/G+fjibhN/I987BMxmURCgOJtxvnrNHBcRNNcPE1zA1Clax7aF1xHsoc/hQM69s5l53yn+oUVrwYOtKhCkdHUAEt4q+W05Wwmu8fCa2CsvVL+jRsQZuzHXvrAlDK7fFMXXhWXuwifcUgy1Pbs8/YB/5tZpb+7j4L6o1QWNiigV59tLnIhOrUDVg2QFY2faBwpz4U43wuv7E2Ja6LytCtq2GW7pqqijJkZ0S6ZGdboKbsqnng0Ga0ajQOE3Zk7d0VDZUII3AgwyjrtlPEvCj4I+F6Dh1qnDOPJuxXMXneFmLZnalCxKwTI++AD7Wy52UfGobpIT+PD9CvQsWdg1soY5/rWCee9IglMLkqk7cFnE9dr/7UEu8A--jdql9gLIl1nCNPIR--a5viSALkWuhIDi9/1Z6NTw==
\ No newline at end of file
diff --git a/config/initializers/google_analytics.rb b/config/initializers/google_analytics.rb
deleted file mode 100644
index 7fe2c4d82..000000000
--- a/config/initializers/google_analytics.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module GoogleAnalytics
- TRACKING_ID = ENV.fetch("TRACKING_ID", "#TRACKING_ID_env_var_missing")
- JS_URL = "https://www.googletagmanager.com/ns.html?id=#{GoogleAnalytics::TRACKING_ID}"
-end