Commit Graph

338 Commits

Author SHA1 Message Date
Saúl Ibarra Corretgé
8261f7233c jicofo,jigase: add ability to extend the config file 2020-12-09 10:38:45 +01:00
Mark
6a4887d7fc web: use env variables to set worker processes and connections
Use 2 new environment variables to allow setting the number of nginx worker processes and connections. Add the variables to the docker-compose file and to the nginx-conf where default values are also set.
2020-12-09 00:30:57 +01:00
Paul Tiedtke
5679578d80 prosody: add env var to config cross domain settings 2020-12-08 21:04:53 +01:00
Felix Geyer
effb30b970 prosody: always rebuild configs on start
Fixes the upgrade which enabled XMPP websockets in the web config
but the necessary changes in the prosody config weren't applied.
2020-12-08 21:03:40 +01:00
Felix Geyer
905d431e14 jicofo,jigasi: always rebuild configs on start 2020-12-08 15:02:23 +01:00
Saúl Ibarra Corretgé
c52b64a39e misc: working on latest 2020-12-04 23:18:09 +01:00
Saúl Ibarra Corretgé
7a1c2f3cc8 release: stable-5142-2
* 700c04a web: properly handle acme.sh return codes
* 4cb181c web: install acme certs to persistent storage
* 1d2c68a web: fix running acme.sh on the right home directory
* 5c44a84 misc: stop using apt-key, it's deprecated
* 5f06c3a doc: update CHANGELOG
* 0f780b4 misc: working on latest
2020-12-04 23:11:22 +01:00
Saúl Ibarra Corretgé
700c04a629 web: properly handle acme.sh return codes
It exits with 2 in case a renew is not necessary.
2020-12-04 15:40:18 +01:00
Saúl Ibarra Corretgé
4cb181c1b2 web: install acme certs to persistent storage 2020-12-04 15:17:48 +01:00
Saúl Ibarra Corretgé
1d2c68a32f web: fix running acme.sh on the right home directory 2020-12-04 15:17:04 +01:00
Saúl Ibarra Corretgé
5c44a84eb4 misc: stop using apt-key, it's deprecated
Fixes: https://github.com/jitsi/docker-jitsi-meet/issues/480
2020-12-04 11:29:47 +01:00
Saúl Ibarra Corretgé
5f06c3a1e8 doc: update CHANGELOG 2020-12-02 23:59:39 +01:00
Saúl Ibarra Corretgé
0f780b48ee misc: working on latest 2020-12-02 23:53:36 +01:00
Saúl Ibarra Corretgé
90fe628293 release: stable-5142-1
* b0cb4a1 web: update TLS config to Mozilla security guidelines
* 0601212 web: replace certbot with acme.sh
* 43f678d build: refactor Makefile
* b00f92a web: use Python 3 only for certbot
* 880b9b0 core: update base image to Debian Buster
* ba01190 web: prevent s6 from restarting cron if it shouldn't be run
* 42a4346 etherpad: use official image and making skin full width
* c36c4d0 web: always rebuild nginx configs on start
* aea4411 Adds private server.
* 6b69576 web: add ability to configure tokenAuthUrl
* ff6d9bc Fix websocket
* e5746ae misc: add ENABLE_PREJOIN_PAGE to .env
* 465816b web,prosody: turn on XMPP WebSocket by default
* d747bfb web,prosody: add XMPP WebSocket / Stream Management support
* 130eb55 jvb: migrate to new config file
* 5290499 doc: updated link for running behind NAT
* 7cb470c misc: support/encourage usage of ShellCheck
* 04a210f misc: working on latest
2020-12-02 23:46:19 +01:00
Jonathan Lennox
b0cb4a1846 web: update TLS config to Mozilla security guidelines 2020-12-02 23:20:15 +01:00
Saúl Ibarra Corretgé
06012127e9 web: replace certbot with acme.sh
The former seems to be in a pretty bad state for usage with Debian based
containers:

- The Debian provided package is too old
- certbot-auto no longer works on Debian
- The recommended way of using snap is not Docker friendly

Thus, we are migrating to acme.sh, which has the advantage of also
making the web container slimmer.
2020-12-02 16:03:17 +01:00
Saúl Ibarra Corretgé
43f678d967 build: refactor Makefile
Use a single one with dynamically generated rules instead of individual
makefiles which are 99% boilerplate.
2020-12-02 16:03:17 +01:00
Saúl Ibarra Corretgé
b00f92ae19 web: use Python 3 only for certbot
certbot-auto will install both Python 2 and 3 packages thus resulting un
unnecessary image bloat. Also, there is no need to install compilers or
development libraries since Wheels are available for the required
packags.
2020-12-02 16:03:17 +01:00
Saúl Ibarra Corretgé
880b9b0e91 core: update base image to Debian Buster 2020-12-02 16:03:17 +01:00
mammo0
ba011900fb web: prevent s6 from restarting cron if it shouldn't be run 2020-12-02 12:58:19 +01:00
Paul Tiedtke
42a43462d5 etherpad: use official image and making skin full width 2020-11-30 20:45:43 +01:00
Felix Geyer
c36c4d02a7 web: always rebuild nginx configs on start 2020-11-27 21:31:20 +01:00
bbaldino
5584aa244a Merge pull request #822 from pierreozoux/patch-1
Change private http server to listen on 0.0.0.0
2020-11-19 08:29:57 -08:00
Pierre Ozoux
aea4411d3b Adds private server. 2020-11-19 15:45:13 +01:00
D3473R
6b69576c2f web: add ability to configure tokenAuthUrl 2020-11-19 12:43:26 +01:00
Pierre Ozoux
ff6d9bc6aa Fix websocket
We noticed that websocket were broken with this config.

We believe that the translation from old config to new config in [this commit](130eb551a7 (diff-6f9b0c296a7ff789834c1414349f64f956f2b64df6e405fd45f62c6a11edad3fL34)) didn't translate it well.

We are actually wondering what does private stands for in this context.

With this change, we can confirm that wss works again as expected.
2020-11-17 09:42:45 +01:00
Thomas Ritter
e5746ae0f4 misc: add ENABLE_PREJOIN_PAGE to .env 2020-11-03 23:27:51 +01:00
Saúl Ibarra Corretgé
465816b4eb web,prosody: turn on XMPP WebSocket by default 2020-10-29 21:57:54 +01:00
Jan-Otto Kröpke
d747bfbe6b web,prosody: add XMPP WebSocket / Stream Management support 2020-10-29 21:44:48 +01:00
bbaldino
130eb551a7 jvb: migrate to new config file 2020-10-29 21:20:00 +01:00
limitedAtonement
529049942f doc: updated link for running behind NAT 2020-10-26 15:49:23 +01:00
Robin Schneider
7cb470c3c6 misc: support/encourage usage of ShellCheck
My editor detected `.env` as shell script and thus automatically checked
it with ShellCheck. I would propose to make it a valid shell script that
complies with ShellCheck by default. To do this, we just need to disable
https://github.com/koalaman/shellcheck/wiki/SC2034 because the variables
are not used (in that file).

When you search for "docker-compose .env shellcheck SC2034" it turns out
that I am not the first one to do this :)
2020-10-20 09:07:17 +02:00
Saúl Ibarra Corretgé
04a210f54b misc: working on latest 2020-10-16 15:49:16 +02:00
Saúl Ibarra Corretgé
77aafe0573 release: stable-5142
* 7ab45bb web: add ability to configure prejoin page
* 0c95794 jvb: regenerate config on every boot
* 3ef2221 jvb: add ability to set the WS domain with an env var
* 79d2601 jvb: add ability to specify set the WS_SERVER_ID with an env var
* b277926 jvb: make colibri websocket endpoints dynamic for multiple jvbs
* 991f695 web: remove no longer needed settings
* 8b7cbc3 revert "jicofo: no auth URL in JWT auth mode"
* 33b386b jvb: add missing variable to docker-compose
* 087f024 web: configure brandingDataUrl with env variables
* a404653 web: configure startAudioOnly using environment variable
* e195cbf jvb: make jvb apis available from outside the container
* 409cade web: configure Matomo using environment variables
* b731c60 doc: update CHANGELOG
* 0fbf3b7 misc: working on latest
2020-10-16 15:44:16 +02:00
Saúl Ibarra Corretgé
7ab45bbb37 web: add ability to configure prejoin page 2020-10-16 15:28:20 +02:00
Saúl Ibarra Corretgé
0c957941bc jvb: regenerate config on every boot 2020-10-16 15:08:20 +02:00
Saúl Ibarra Corretgé
3ef222152e jvb: add ability to set the WS domain with an env var 2020-10-16 15:08:20 +02:00
Saúl Ibarra Corretgé
79d2601cbd jvb: add ability to specify set the WS_SERVER_ID with an env var 2020-10-16 15:08:20 +02:00
Paul Tiedtke
b277926332 jvb: make colibri websocket endpoints dynamic for multiple jvbs 2020-10-16 15:08:20 +02:00
Saúl Ibarra Corretgé
991f695275 web: remove no longer needed settings
They default to true now and they have been removed.
2020-10-16 14:22:29 +02:00
paweldomas
8b7cbc3fff revert "jicofo: no auth URL in JWT auth mode" 2020-10-13 15:46:50 +02:00
miggland
33b386bae7 jvb: add missing variable to docker-compose
Variable JVB_TCP_MAPPED_PORT is used in jvb/roots/defaults/sip-communicator.properties, but is not defined yet in the docker-compose.yml file
(Variable added in commit 1205170056)
2020-10-09 17:40:59 +02:00
Ludovic Muller
087f024fcb web: configure brandingDataUrl with env variables 2020-10-08 10:13:44 +02:00
NullIsNot0
a404653197 web: configure startAudioOnly using environment variable 2020-10-08 10:12:12 +02:00
Paul Tiedtke
e195cbf21a jvb: make jvb apis available from outside the container 2020-10-08 10:11:06 +02:00
Ludovic Muller
409cade8ec web: configure Matomo using environment variables 2020-10-08 10:09:38 +02:00
Saúl Ibarra Corretgé
b731c6033f doc: update CHANGELOG 2020-10-02 17:37:12 +02:00
Saúl Ibarra Corretgé
0fbf3b74ba misc: working on latest 2020-10-02 17:26:25 +02:00
Saúl Ibarra Corretgé
b524acb3e7 release: stable-5076
* 5ceaf5f web: add IPv6 support
* aff3775 xmpp: allow recorders to bypass lobby
* ad5625b jvb: switch to WebSocket based bridge channels
* 8110336 web: add ability to configure the nginx resolver
* 2f47518 jicofo: no auth URL in JWT auth mode
* c149463 web: build config.js on each boot
* c792bbc base: update frep
* bec928c prosody: configure lobby on the guest domain is necessary
* bcbd977 jicofo: pass XMPP_MUC_DOMAIN through docker-compose.yml
* 8f9caa4 jicofo: set XMPP_MUC_COMPONENT_PREFIX
* 2a0120d web: set security headers also for non HTTPS
* e6586f2 jvb: set LOCAL_ADDRESS to the correct local IP (#630)
* 97f5e75 base: optimize size
* b78c89e misc: minor Dockerfile Improvements
* a754519 misc: working on latest
2020-10-02 17:21:16 +02:00
Ludovic Muller
5ceaf5fd02 web: add IPv6 support 2020-10-02 16:56:20 +02:00