Merge branch 'master' into 'live'

environmental instance id See merge request !97
2018-11-15 12:24:45 +01:00 · 2018-11-15 12:24:45 +01:00 · 6f04978b1a
commit 6f04978b1a
parent d2398fb962 a3d22baa5b
3 changed files with 3 additions and 1 deletions
--- a/config/keter_testworx.yml
+++ b/config/keter_testworx.yml
@ -46,6 +46,7 @@ stanzas:
      - SMTPPASS
      - SMTPTIMEOUT
      - SMTPLIMIT
+      - INSTANCE_ID

 # Use the following to automatically copy your bundle upon creation via `yesod
 # keter`. Uses `scp` internally, so you can set it to a remote destination
--- a/config/keter_uni2work.yml
+++ b/config/keter_uni2work.yml
@ -45,6 +45,7 @@ stanzas:
      - SMTPPASS
      - SMTPTIMEOUT
      - SMTPLIMIT
+      - INSTANCE_ID


 # Use the following to automatically copy your bundle upon creation via `yesod
--- a/config/settings.yml
+++ b/config/settings.yml
@ -88,4 +88,4 @@ user-defaults:
  time-format:      "%R"
  download-files:   false

-instance-idfile: "_env:INSTANCE_ID:instance"
+instance-id: "_env:INSTANCE_ID:instance"