Merge branch 'main' into ch/run-tests-on-ci

sample.env

@@ -1,4 +1,4 @@
-### REBUILD THE DEVCONTAINER WHEN YOU MODIFY .ENV ###
+# ## REBUILD THE DEVCONTAINER WHEN YOU MODIFY .ENV ###
 
 # Debug
 DEBUG=True
@@ -13,6 +13,7 @@ NOTIFY_LOG_PATH=/workspace/logs/app.log
 
 # secrets that internal apps, such as the admin app or document download, must use to authenticate with the API
 ADMIN_CLIENT_ID=notify-admin
+ADMIN_CLIENT_SECRET=dev-notify-secret-key
 GOVUK_ALERTS_CLIENT_ID=govuk-alerts
 
 # Flask
@@ -22,19 +23,19 @@ WERKZEUG_DEBUG_PIN=off
 SECRET_KEY=dev-notify-secret-key
 DANGEROUS_SALT=dev-notify-salt
 
-# URL of admin app
-ADMIN_BASE_URL=http://0.0.0.0:6012
+# URL of admin app, this is overriden on cloudfoundry
+ADMIN_BASE_URL=http://admin:6012
 
-# URL of api app (on AWS this is the internal api endpoint)
-API_HOST_NAME=http://0.0.0.0:6011
+# URL of api app, this is overriden on cloudfoundry
+API_HOST_NAME=http://dev:6011
 
-# URL of redis instance
+# URL of redis instance, this is overriden on cloudfoundry
 REDIS_URL=redis://redis:6380
 REDIS_ENABLED=1
 
 # AWS
 AWS_REGION=us-west-2
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-AWS_PINPOINT_REGION=
-AWS_US_TOLL_FREE_NUMBER=
+AWS_ACCESS_KEY_ID="don't write secrets to the sample file"
+AWS_SECRET_ACCESS_KEY="don't write secrets to the sample file"
+AWS_PINPOINT_REGION=us-west-2
+AWS_US_TOLL_FREE_NUMBER=+18446120782