From e8a263e2973eb715418c90a2745898b7a900a857 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 10 Aug 2016 15:18:49 +0200 Subject: [PATCH] Allow specifying docker secrets with enviroment variables --- scripts/docker_entrypoint.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/docker_entrypoint.sh b/scripts/docker_entrypoint.sh index e466854b..3f3719c0 100644 --- a/scripts/docker_entrypoint.sh +++ b/scripts/docker_entrypoint.sh @@ -28,10 +28,10 @@ openssl x509 -in /srv/cert.pem -text if [ "$NEWSECRETS" = "1" -o ! -s /srv/secrets.conf ]; then echo "Creating new server secrets ..." rm -f /srv/secrets.conf.tmp - echo "SESSION_SECRET=$(randomhex 32)" >>/srv/secrets.conf.tmp - echo "ENCRYPTION_SECRET=$(randomhex 32)" >>/srv/secrets.conf.tmp - echo "SERVER_TOKEN=$(randomhex 32)" >>/srv/secrets.conf.tmp - echo "SHARED_SECRET=$(randomhex 32)" >>/srv/secrets.conf.tmp + echo "SESSION_SECRET=${SESSION_SECRET:-$(randomhex 32)}" >>/srv/secrets.conf.tmp + echo "ENCRYPTION_SECRET=${ENCRYPTION_SECRET:-$(randomhex 32)}" >>/srv/secrets.conf.tmp + echo "SERVER_TOKEN=${SERVER_TOKEN:-$(randomhex 32)}" >>/srv/secrets.conf.tmp + echo "SHARED_SECRET=${SHARED_SECRET:-$(randomhex 32)}" >>/srv/secrets.conf.tmp . /srv/secrets.conf.tmp sed -i -e "s/sessionSecret =.*/sessionSecret = $SESSION_SECRET/" /srv/spreed-webrtc/default.conf sed -i -e "s/encryptionSecret =.*/encryptionSecret = $ENCRYPTION_SECRET/" /srv/spreed-webrtc/default.conf