diff --git a/CHANGELOG.md b/CHANGELOG.md index 634adc4..0c48b8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Unreleased - BigBlueButton v2.4 @alangecker [#159](https://github.com/bigbluebutton/docker/pull/159) +- **Breaking change:** change nginx port from `8080` to `48087`. see [upgrade note](docs/upgrading.md) @alangeker [#133](https://github.com/bigbluebutton/docker/issues/133) - Enable optimization for Prometheus Exporter when recording is enabled @omidmaldar [#161](https://github.com/bigbluebutton/docker/pull/161) - Automatically remove old recordings after N days @omidmaldar [#162](https://github.com/bigbluebutton/docker/pull/162) diff --git a/docker-compose.tmpl.yml b/docker-compose.tmpl.yml index 4c65f3c..5f93f42 100644 --- a/docker-compose.tmpl.yml +++ b/docker-compose.tmpl.yml @@ -363,7 +363,7 @@ services: DB_USERNAME: postgres DB_PASSWORD: ${POSTGRESQL_SECRET:-password} {{ if isTrue .Env.DEV_MODE }} - BIGBLUEBUTTON_ENDPOINT: http://10.7.7.1:8080/bigbluebutton/api/ + BIGBLUEBUTTON_ENDPOINT: http://10.7.7.1:48087/bigbluebutton/api/ {{else}} BIGBLUEBUTTON_ENDPOINT: https://${DOMAIN}/bigbluebutton/api/ {{end}} @@ -393,7 +393,7 @@ services: image: greenstatic/bigbluebutton-exporter:v0.7.0-preview2 restart: unless-stopped environment: - API_BASE_URL: http://10.7.7.1:8080/bigbluebutton/api/ + API_BASE_URL: http://10.7.7.1:48087/bigbluebutton/api/ API_SECRET: ${SHARED_SECRET} RECORDINGS_METRICS_READ_FROM_DISK: "${ENABLE_PROMETHEUS_EXPORTER_OPTIMIZATION:-false}" networks: diff --git a/docs/existing-web-server.md b/docs/existing-web-server.md index 867e32f..adf2ff8 100644 --- a/docs/existing-web-server.md +++ b/docs/existing-web-server.md @@ -8,7 +8,7 @@ You could dedicate a virtual host to BigBlueButton, allowing external access to ## Installation 1. Install BigBlueButton Docker [as explained above](#install). While running the setup script, please choose `n` when you're asked the following question: `Should an automatic HTTPS Proxy be included? (y/n)`. -2. Now all the required Docker containers should be running. BigBlueButton listens to port 8080. Create a virtual host by which BigBlueButton will be publicly accessible (in this case, let's assume the following server name for the virtual host: `bbb.example.com`). Enable SSL for the new _https_ virtual host. Make sure that the SSL certificate you will be using is signed by a CA (Certificate Authority). You could generate an SSL certificate for free using Let's Encrypt. It is suggested to add some directives to the _http_ virtual host `bbb.example.com` to redirect all requests to the _https_ one. +2. Now all the required Docker containers should be running. BigBlueButton listens to port 48087. Create a virtual host by which BigBlueButton will be publicly accessible (in this case, let's assume the following server name for the virtual host: `bbb.example.com`). Enable SSL for the new _https_ virtual host. Make sure that the SSL certificate you will be using is signed by a CA (Certificate Authority). You could generate an SSL certificate for free using Let's Encrypt. It is suggested to add some directives to the _http_ virtual host `bbb.example.com` to redirect all requests to the _https_ one. At this point, choose one of the following sections according to which Web server you're running ([Apache](#integration-with-apache)). @@ -39,7 +39,7 @@ server { location / { proxy_http_version 1.1; - proxy_pass http://$endpoint_addr:8080; + proxy_pass http://$endpoint_addr:48087; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -68,12 +68,12 @@ ProxyPreserveHost On RewriteEngine On RewriteCond %{HTTP:UPGRADE} ^WebSocket$ [NC,OR] RewriteCond %{HTTP:CONNECTION} ^Upgrade$ [NC] -RewriteRule .* ws://127.0.0.1:8080%{REQUEST_URI} [P,QSA,L] +RewriteRule .* ws://127.0.0.1:48087%{REQUEST_URI} [P,QSA,L] Require all granted - ProxyPass http://127.0.0.1:8080/ - ProxyPassReverse http://127.0.0.1:8080/ + ProxyPass http://127.0.0.1:48087/ + ProxyPassReverse http://127.0.0.1:48087/ ``` 3. Restart Apache: diff --git a/docs/upgrading.md b/docs/upgrading.md index 82e1023..80261ad 100644 --- a/docs/upgrading.md +++ b/docs/upgrading.md @@ -1,6 +1,11 @@ # How To Upgrade bbb-docker -### within `2.3.x +### Upgrading `v2.3.x` -> `v2.4.x` +*Breaking change:* The nginx port changes from `8080` to the less common port `48087`, to avoid port conflicts (see [#133](https://github.com/bigbluebutton/docker/issues/133)). If you use an reverse proxy not included in this repo, ensure to update your config accordingly! + +apart from that follow the guide below. + +### within `v2.4.x` or `v2.3.x` #### Backup if you use greenlight, create a database backup first ```bash @@ -15,44 +20,3 @@ docker exec -t docker_postgres_1 pg_dumpall -c -U postgres > /root/greenlight_`d # restart updated services docker-compose up -d ``` - - -### from `2.2.x` to `2.3.x` - -```bash -cd bbb-docker - -# if you use greenlight: create a database backup -./scripts/compose exec postgres pg_dumpall -c -U postgres > /root/bbb-docker-2.2-backup.sql - -# stop bbb-docker -./scripts/compose down - -# go back and rename folder -cd .. -mv bbb-docker bbb-docker-2.2-archived - -# get bbb-docker 2.3 -git clone --recurse-submodules https://github.com/bigbluebutton/docker.git bbb-docker -cd bbb-docker - -# do setup -./scripts/setup - -# optionally do additional changes -nano .env - -# regenerate the docker-compose file -./scripts/generate-compose - -# if you use greenlight, import database backup -docker-compose up -d postgres -cat /root/bbb-docker-2.2-backup.sql | docker-compose exec -T postgres psql -U postgres - -# start new BBB 2.3 -docker-compose up -d - - -``` -- `$ cd bbb-docker` -- (if you use greenlight) create a database backup first diff --git a/mod/https/site-ipv4only.conf b/mod/https/site-ipv4only.conf index 8b0abff..3ab9c1c 100644 --- a/mod/https/site-ipv4only.conf +++ b/mod/https/site-ipv4only.conf @@ -16,7 +16,7 @@ server { location / { proxy_http_version 1.1; - proxy_pass http://127.0.0.1:8080; + proxy_pass http://127.0.0.1:48087; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/mod/https/site.conf b/mod/https/site.conf index 9b21df6..ba81f57 100644 --- a/mod/https/site.conf +++ b/mod/https/site.conf @@ -16,7 +16,7 @@ server { location / { proxy_http_version 1.1; - proxy_pass http://$endpoint_addr:8080; + proxy_pass http://$endpoint_addr:48087; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/mod/nginx/bigbluebutton b/mod/nginx/bigbluebutton index 65ae22e..fbbf02a 100644 --- a/mod/nginx/bigbluebutton +++ b/mod/nginx/bigbluebutton @@ -17,8 +17,8 @@ upstream poolhtml5servers { } server { - listen 8080 default_server; - listen [::]:8080 default_server; + listen 48087 default_server; + listen [::]:48087 default_server; server_name _; access_log /dev/stdout; absolute_redirect off;