Move variables to configuration.yml file

.github/workflows/azure-deploy-dev.yml

@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - main
+      - er-signup-url
     paths-ignore:
       - '**/*.md'
       - .docker*

app/views/layouts/_analytics_body.html.erb

@@ -1,6 +1,6 @@
 <!-- Google Tag Manager (noscript) -->
 <noscript>
-    <iframe src="<%= GoogleAnalytics::JS_URL %>" height="0" width="0" style="display:none;visibility:hidden">
+    <iframe src="<%= Rails.configuration.js_url %>" height="0" width="0" style="display:none;visibility:hidden">
     </iframe>
 </noscript>
 <!-- End Google Tag Manager (noscript) -->

app/views/layouts/_analytics_header.html.erb

@@ -1,9 +1,9 @@
 <!-- Google tag (gtag.js) -->
-<script async src=<%= "https://www.googletagmanager.com/gtag/js?id=#{GoogleAnalytics::TRACKING_ID}" %>></script>
+<script async src=<%= Rails.configuration.js_url %>></script>
 <script>
   window.dataLayer = window.dataLayer || [];
   function gtag(){dataLayer.push(arguments);}
   gtag('js', new Date());
 
-  gtag('config', '<%= GoogleAnalytics::TRACKING_ID %>');
+  gtag('config', '<%= Rails.configuration.tracking_id %>');
 </script>

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

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

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==
+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==