diff options
| author | Quentin <quentin@deuxfleurs.fr> | 2020-12-23 15:55:17 +0100 |
|---|---|---|
| committer | Quentin <quentin@deuxfleurs.fr> | 2020-12-23 15:55:17 +0100 |
| commit | 80dc6ec803949bbb09a8d40c80daaa9c676c0fb6 (patch) | |
| tree | d2a44cf03ef3f3d9c3646846b4a7d8153181fbc9 /app/build | |
| parent | 9117616f0250ab0ac724c6aa9a5b6d94ec7c9d92 (diff) | |
| download | infrastructure-80dc6ec803949bbb09a8d40c80daaa9c676c0fb6.tar.gz infrastructure-80dc6ec803949bbb09a8d40c80daaa9c676c0fb6.zip | |
Migrate jitsi
Diffstat (limited to 'app/build')
| -rw-r--r-- | app/build/docker-compose.yml | 6 | ||||
| -rwxr-xr-x | app/build/jitsi-meet/entrypoint.sh | 4 | ||||
| -rw-r--r-- | app/build/jitsi-xmpp/Dockerfile | 4 | ||||
| -rwxr-xr-x | app/build/jitsi-xmpp/xmpp_conf | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/app/build/docker-compose.yml b/app/build/docker-compose.yml index 38031d2..de2c229 100644 --- a/app/build/docker-compose.yml +++ b/app/build/docker-compose.yml @@ -49,7 +49,7 @@ services: # https://github.com/jitsi/jitsi-meet PREFIXV: stable/jitsi-meet_ VERSION: 4966 - image: superboum/amd64_jitsi_meet:v1 + image: superboum/amd64_jitsi_meet:v2 jitsi-conference-focus: build: @@ -73,8 +73,8 @@ services: build: context: ./jitsi-xmpp args: - VERSION: fake-1 - image: superboum/amd64_jitsi_xmpp:v4 + VERSION: 0.11.2-1 + image: superboum/amd64_jitsi_xmpp:v8 plume: build: diff --git a/app/build/jitsi-meet/entrypoint.sh b/app/build/jitsi-meet/entrypoint.sh index 1e18bd1..1cd96dc 100755 --- a/app/build/jitsi-meet/entrypoint.sh +++ b/app/build/jitsi-meet/entrypoint.sh @@ -4,8 +4,8 @@ cat > /etc/nginx/sites-available/jitsi <<EOF server_names_hash_bucket_size 64; server { - listen 0.0.0.0:443 ssl http2 default_server; - listen [::]:443 ssl http2 default_server; + listen 0.0.0.0:${NGINX_PORT} ssl http2 default_server; + listen [::]:${NGINX_PORT} ssl http2 default_server; server_name _; ssl_certificate ${JITSI_CERTS_FOLDER}/jitsi.deuxfleurs.fr.crt; ssl_certificate_key ${JITSI_CERTS_FOLDER}/jitsi.deuxfleurs.fr.key; diff --git a/app/build/jitsi-xmpp/Dockerfile b/app/build/jitsi-xmpp/Dockerfile index 3733d49..f3dcd36 100644 --- a/app/build/jitsi-xmpp/Dockerfile +++ b/app/build/jitsi-xmpp/Dockerfile @@ -1,7 +1,9 @@ FROM debian:buster +ARG VERSION + RUN apt-get update && \ - apt-get install -y prosody + apt-get install -y prosody=${VERSION} COPY external_components.cfg.lua /etc/prosody/conf.d/external_components.cfg.lua COPY xmpp_conf /usr/local/bin/xmpp_conf diff --git a/app/build/jitsi-xmpp/xmpp_conf b/app/build/jitsi-xmpp/xmpp_conf index 5990d07..34b2cb3 100755 --- a/app/build/jitsi-xmpp/xmpp_conf +++ b/app/build/jitsi-xmpp/xmpp_conf @@ -7,6 +7,8 @@ EOF mkdir -p /etc/prosody/conf.{d,avail}/ cat > /etc/prosody/conf.avail/jitsi.deuxfleurs.fr.cfg.lua <<EOF +http_ports = { ${JITSI_PROSODY_BOSH_PORT} } + VirtualHost "jitsi.deuxfleurs.fr" authentication = "anonymous" ssl = { |