diff --git a/manifests/bin/deploy.sh b/manifests/bin/deploy.sh index 2e8c599..f3fd33c 100755 --- a/manifests/bin/deploy.sh +++ b/manifests/bin/deploy.sh @@ -34,7 +34,7 @@ function kgcmkey() { }; export -f kgcmkey function get_synapse_key() { - kgcmkey synapse 'homeserver\.yaml' | awk -F\" "/^\s*$1/{print \$2}" || openssl rand -hex 32 + kgcmkey synapse homeserver.yaml | awk -F\" "/^\s*$1/{print \$2}" || openssl rand -hex 32 } @@ -51,8 +51,8 @@ export TURN_SHARED_SECRET; TURN_SHARED_SECRET="$(get_synapse_key turn_shared_s export REGISTRATION_SECRET; REGISTRATION_SECRET="$(get_synapse_key registration_shared_secret)" kcreatecm synapse \ - --from-file=homeserver.yaml=<(envsubst "$(env | xargs printf '$%s ')" < config/homeserver.yaml) \ - --from-file=log.config=<(envsubst "$(env | xargs printf '$%s ')" < config/log.config) + --from-file=homeserver.yaml=<(envsubst < config/homeserver.yaml) \ + --from-file=log.config=<(envsubst < config/log.config) kapply common/keys.yaml common/app.yaml