From 656ace609670990954df80f5d917ca89002e5b4e Mon Sep 17 00:00:00 2001 From: chandi Date: Wed, 22 Jul 2020 23:02:50 +0200 Subject: [PATCH] devmode: disable lets encrypt, greenlight support --- docker-compose.greenlight.yml | 2 +- docker-compose.https.yml | 2 +- scripts/compose | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docker-compose.greenlight.yml b/docker-compose.greenlight.yml index 018ca9c..3c03908 100644 --- a/docker-compose.greenlight.yml +++ b/docker-compose.greenlight.yml @@ -12,7 +12,7 @@ services: DB_NAME: greenlight DB_USERNAME: postgres DB_PASSWORD: password - BIGBLUEBUTTON_ENDPOINT: https://${DOMAIN}/bigbluebutton/api/ + BIGBLUEBUTTON_ENDPOINT: http://10.7.7.1:8080/bigbluebutton/api/ BIGBLUEBUTTON_SECRET: ${SHARED_SECRET} SECRET_KEY_BASE: ${RAILS_SECRET} ports: diff --git a/docker-compose.https.yml b/docker-compose.https.yml index 3f01cdd..6abc6ec 100644 --- a/docker-compose.https.yml +++ b/docker-compose.https.yml @@ -7,7 +7,7 @@ services: - ssl_data:/etc/resty-auto-ssl - ./mod/https/site.conf:/etc/nginx/conf.d/bbb-docker.conf environment: - ALLOWED_DOMAINS: ${DOMAIN} + ALLOWED_DOMAINS: ${CERTIFICATE_DOMAINS} network_mode: host volumes: diff --git a/scripts/compose b/scripts/compose index 7661339..b2ecb46 100755 --- a/scripts/compose +++ b/scripts/compose @@ -10,6 +10,11 @@ then export $(cat .env | sed 's/#.*//g' | grep -v "WELCOME_FOOTER" | grep -v "WELCOME_MESSAGE" | xargs) fi +export CERTIFICATE_DOMAINS=$DOMAIN +if [ "$DEV_MODE" == true ]; then + export CERTIFICATE_DOMAINS="invalid" +fi + # concatenate docker-compose file COMPOSE_FILES="-f docker-compose.yml" if [ "$ENABLE_HTTPS_PROXY" == true ]; then