From 46fa25a04d68e9bfc1c696b43680c6ebd01949c8 Mon Sep 17 00:00:00 2001
From: Tony Air <tony@twma.pro>
Date: Tue, 31 Oct 2023 21:37:48 +0200
Subject: [PATCH] IMPR: Some things sorting

---
 app/_config/api-captcha.yml            |  4 ++--
 app/_config/api-map.yml                |  4 ++--
 app/_config/templates-requirements.yml |  4 ++--
 env-dist                               | 12 ++++++++++++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/_config/api-captcha.yml b/app/_config/api-captcha.yml
index 38fbee3..e3f0f7d 100644
--- a/app/_config/api-captcha.yml
+++ b/app/_config/api-captcha.yml
@@ -11,8 +11,8 @@ SilverStripe\SpamProtection\Extension\FormSpamProtectionExtension:
   default_spam_protector: UndefinedOffset\NoCaptcha\Forms\NocaptchaProtector
 
 UndefinedOffset\NoCaptcha\Forms\NocaptchaField:
-  site_key: '6LfKgywaAAAAAH2VuHILbaNoUs0p0YZBNbNGyIsh' #Your site key (required)
-  secret_key: '6LfKgywaAAAAAJ0mxLSg1pZQIqui1gXSp2GGRKbY' #Your secret key (required)
+  site_key: '`NOCAPTCHA_SITE_KEY`' #Your site key (required)
+  secret_key: '`NOCAPTCHA_SECRET_KEY`' #Your secret key (required)
   verify_ssl: true #Allows you to disable php-curl's SSL peer verification by setting this to false (optional, defaults to true)
   default_theme: 'light' #Default theme color (optional, light or dark, defaults to light)
   default_type: 'image' #Default captcha type (optional, image or audio, defaults to image)
diff --git a/app/_config/api-map.yml b/app/_config/api-map.yml
index f590df8..b43937c 100644
--- a/app/_config/api-map.yml
+++ b/app/_config/api-map.yml
@@ -19,10 +19,10 @@ A2nt\ElementalBasics\Elements\MapElement:
 
 BetterBrief\GoogleMapField:
   default_options:
-    api_key: ''
+    api_key: '`GOOGLEMAPS_API_KEY`'
 
 Symbiote\Addressable\MapboxGeocodeService:
-  mapbox_api_key: ''
+  mapbox_api_key: '`MAPBOX_API_KEY`'
 
 SilverStripe\SiteConfig\SiteConfig:
   map_type: "google-maps"
diff --git a/app/_config/templates-requirements.yml b/app/_config/templates-requirements.yml
index 5a7e3a2..2ba9095 100644
--- a/app/_config/templates-requirements.yml
+++ b/app/_config/templates-requirements.yml
@@ -10,11 +10,11 @@ A2nt\CMSNiceties\Templates\DeferredRequirements:
   deferred: true
   noreact: true
   nojquery: true
-  jquery_version: '3.4.1'
+  jquery_version: '`JQUERY_VER`'
   fontawesome_svg: false
 
 SilverStripe\FontAwesome\FontAwesomeField:
-  version: '6.4.2'
+  version: '`FONTAWESOME_VER`'
 
 SilverStripe\View\Requirements:
   disable_flush_combined: true
diff --git a/env-dist b/env-dist
index fc793c1..056b0d3 100644
--- a/env-dist
+++ b/env-dist
@@ -7,3 +7,15 @@ SS_DEFAULT_ADMIN_USERNAME=''
 SS_DEFAULT_ADMIN_PASSWORD=''
 
 SS_ENVIRONMENT_TYPE='dev'
+
+NOCAPTCHA_SITE_KEY=''
+NOCAPTCHA_SECRET_KEY=''
+
+GOOGLEMAPS_API_KEY=''
+MAPBOX_API_KEY=''
+
+APP_SMTP_USERNAME=''
+APP_SMTP_PASSWORD=''
+
+FONTAWESOME_VER='6.4.2'
+JQUERY_VER='3.4.1'