diff --git a/docker-compose.yml b/docker-compose.yml index 130ee20..c124ac7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,7 @@ services: depends_on: - redis environment: + DEV_MODE: ${DEV_MODE:-} DOMAIN: ${DOMAIN} SHARED_SECRET: ${SHARED_SECRET} WELCOME_MESSAGE: ${WELCOME_MESSAGE:-} @@ -147,6 +148,7 @@ services: DISABLE_VIDEO_PREVIEW: ${DISABLE_VIDEO_PREVIEW:-false} CHAT_ENABLED: ${CHAT_ENABLED:-true} CHAT_START_CLOSED: ${CHAT_START_CLOSED:-false} + DEV_MODE: ${DEV_MODE:-} networks: bbb-net: ipv4_address: 10.7.7.11 diff --git a/docs/development.md b/docs/development.md new file mode 100644 index 0000000..4a72642 --- /dev/null +++ b/docs/development.md @@ -0,0 +1,45 @@ +# bbb-docker Development + +## Running +you can run bbb-docker locally without any certificate issues with following `.env` configurations: + +``` +DEV_MODE=true + +ENABLE_HTTPS_PROXY=true +#ENABLE_COTURN=true +#ENABLE_GREENLIGHT=true +#ENABLE_WEBHOOKS=true + +DOMAIN=10.7.7.1 +EXTERNAL_IP=10.7.7.1 +STUN_IP=216.93.246.18 +STUN_PORT=3478 +TURN_SERVER=turns:localhost:465?transport=tcp + +TURN_SECRET=SuperTurnSecret +SHARED_SECRET=SuperSecret +ETHERPAD_API_KEY=SuperEtherpadKey +RAILS_SECRET=SuperRailsSecret + +# ==================================== +# CUSTOMIZATION +# ==================================== + +[... add rest of sample.env here ...] +``` + +- you can than start it with \ + `$ ./scripts/compose up -d` +- view the logs with \ + `$ ./scripts/compose logs -f` +- and access the API via \ + https://mconf.github.io/api-mate/#server=https://10.7.7.1/bigbluebutton/api&sharedSecret=SuperSecret + * At some point your browser will warn you about an invalid certificate, but you can press _"Accept the Risk and Continue" / "Proceed to 10.7.7.1 (unsafe)"_ + +## Changes +- After doing some changes you usually must... + * rebuild the image(s): \ + `$ ./scripts/compose build [containername]` + * restart changes image(s): \ + `$ ./scripts/compose up -d` \ No newline at end of file diff --git a/mod/core/web/bigbluebutton.properties b/mod/core/web/bigbluebutton.properties index 5791073..2af6d9f 100644 --- a/mod/core/web/bigbluebutton.properties +++ b/mod/core/web/bigbluebutton.properties @@ -297,7 +297,11 @@ beans.presentationService.testPresentationName=appkonference # Uploaded presentation file beans.presentationService.testUploadedPresentation=appkonference.txt # Default Uploaded presentation file +{{ if isTrue .Env.DEV_MODE }} +beans.presentationService.defaultUploadedPresentation=https://test.bigbluebutton.org/default.pdf +{{else}} beans.presentationService.defaultUploadedPresentation=${bigbluebutton.web.serverURL}/default.pdf +{{end}} presentationBaseURL=${bigbluebutton.web.serverURL}/bigbluebutton/presentation diff --git a/mod/html5/entrypoint.sh b/mod/html5/entrypoint.sh index 08be159..4bbb8d7 100755 --- a/mod/html5/entrypoint.sh +++ b/mod/html5/entrypoint.sh @@ -8,6 +8,11 @@ export ENVIRONMENT_TYPE=production export PORT=3000 export LANG=en_US.UTF-8 +if [ "$DEV_MODE" == true ]; then + echo "DEV_MODE=true, disable TLS certificate rejecting" + export NODE_TLS_REJECT_UNAUTHORIZED=0 +fi + rm -f /app/programs/server/assets/app/config/settings.yml dockerize \ -template /app/programs/server/assets/app/config/settings.yml.tmpl:/app/programs/server/assets/app/config/settings.yml \