Skip to content

Commit 60fbbd8

Browse files
authored
Remove quotes around HOCON substitutions (#1133)
In HOCON, variable substitutions are not performed if the replacement part is in quotes. From the manual: Substitutions are not parsed inside quoted strings. To get a string containing a substitution, you must use value concatenation with the substitution in the unquoted portion: key : ${animal.favorite} is my favorite animal
1 parent f1e9b83 commit 60fbbd8

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

conf/application.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ maproulette {
182182
# Do not use the default value in production, generate a new key and set it via conf or 'MAPROULETTE_SECRET_KEY' env.
183183
# A secure way to get a distinct key is to run 'openssl rand -base64 32' and set the output as the secret key.
184184
secret.key = "%APPLICATION_SECRET%"
185-
secret.key = "${?MAPROULETTE_SECRET_KEY}"
185+
secret.key = ${?MAPROULETTE_SECRET_KEY}
186186

187187
# redirect for OSM
188188
frontend="http://127.0.0.1:3000"

conf/dev.conf.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ include "application.conf"
44
# A secure way to get a distinct key is to run 'openssl rand -base64 32' and set the output as the secret key.
55
# Play 2.9 requires a key of at least 32 characters https://github.com/maproulette/maproulette-backend/issues/1117
66
play.http.secret.key = "DEVLOCAL_1z8rvducX6AaMTXQl4olw71YHj3MCFpRXXTB73TNnTc="
7-
play.http.secret.key = "${?APPLICATION_SECRET}"
7+
play.http.secret.key = ${?APPLICATION_SECRET}
88

99
db.default {
1010
url="jdbc:postgresql://localhost:5432/mp_dev"
@@ -26,7 +26,7 @@ maproulette {
2626
# Do not use the default value in production, generate a new key and set it via conf or 'MAPROULETTE_SECRET_KEY' env.
2727
# A secure way to get a distinct key is to run 'openssl rand -base64 32' and set the output as the secret key.
2828
secret.key = "DEVLOCAL_Jw8W2PMl434eL85+IRvoT7DA+eNR9a9N3ZK2Gfx4ecs="
29-
secret.key = "${?MAPROULETTE_SECRET_KEY}"
29+
secret.key = ${?MAPROULETTE_SECRET_KEY}
3030

3131
scheduler {
3232
startTimeJitterForMinuteTasks = "15 seconds"

0 commit comments

Comments
 (0)