diff options
| author | Quentin <quentin@deuxfleurs.fr> | 2020-09-13 11:46:14 +0200 |
|---|---|---|
| committer | Quentin <quentin@deuxfleurs.fr> | 2020-09-13 11:46:14 +0200 |
| commit | da034dabfcedcded964b6022153cf5a8a7ae9380 (patch) | |
| tree | 46a773e021e58c57a0a0436e4efd0deb133f0199 /app/integration | |
| parent | 744fa8b8c9cfd17ee34967f70393e7597d75daa6 (diff) | |
| download | infrastructure-da034dabfcedcded964b6022153cf5a8a7ae9380.tar.gz infrastructure-da034dabfcedcded964b6022153cf5a8a7ae9380.zip | |
Finally it seems to work
Diffstat (limited to 'app/integration')
| -rw-r--r-- | app/integration/jitsi/01_gen_certs.yml | 2 | ||||
| -rw-r--r-- | app/integration/jitsi/02_run.yml | 9 | ||||
| -rw-r--r-- | app/integration/jitsi/dev.env | 8 |
3 files changed, 8 insertions, 11 deletions
diff --git a/app/integration/jitsi/01_gen_certs.yml b/app/integration/jitsi/01_gen_certs.yml index 2ba3d1d..bf73291 100644 --- a/app/integration/jitsi/01_gen_certs.yml +++ b/app/integration/jitsi/01_gen_certs.yml @@ -1,7 +1,7 @@ version: '3' services: jitsi-xmpp: - image: ./jitsi-xmpp:v2 + image: superboum/amd64_jitsi_xmpp:v2 command: ["/usr/local/bin/xmpp_gen"] volumes: [ './jitsi-certs/:/certs:rw' ] env_file: [ 'dev.env' ] diff --git a/app/integration/jitsi/02_run.yml b/app/integration/jitsi/02_run.yml index 354a548..73eefad 100644 --- a/app/integration/jitsi/02_run.yml +++ b/app/integration/jitsi/02_run.yml @@ -1,8 +1,7 @@ version: '3.4' services: jitsi-xmpp: - image: superboum/amd64_jitsi_xmpp:v2 - network_mode: host + image: superboum/amd64_jitsi_xmpp:v3 ports: - "5222:5222" - "5347:5347" @@ -16,15 +15,13 @@ services: env_file: [ 'dev.env' ] volumes: [ './jitsi-certs/:/certs:ro' ] jitsi-conference-focus: - image: superboum/amd64_jitsi_conference_focus:v3 + image: superboum/amd64_jitsi_conference_focus:v4 env_file: [ 'dev.env' ] volumes: [ './jitsi-certs/:/certs:ro' ] jitsi-videobridge: - image: superboum/amd64_jitsi_videobridge:v11 - network_mode: host + image: superboum/amd64_jitsi_videobridge:v14 ports: - "8080:8080/tcp" - "10000:10000/udp" env_file: [ 'dev.env' ] volumes: [ './jitsi-certs/:/certs:ro' ] - diff --git a/app/integration/jitsi/dev.env b/app/integration/jitsi/dev.env index 4fff8c1..1dd2122 100644 --- a/app/integration/jitsi/dev.env +++ b/app/integration/jitsi/dev.env @@ -2,9 +2,9 @@ JITSI_SECRET_VIDEOBRIDGE=S3CR3T01 JITSI_SECRET_JICOFO_COMPONENT=S3CR3T02 JITSI_SECRET_JICOFO_USER=S3CR3T03 JITSI_PROSODY_BOSH_PORT=5280 -JITSI_PROSODY_BOSH_HOST=127.0.0.1 -JITSI_PROSODY_HOST=127.0.0.1 +JITSI_PROSODY_BOSH_HOST=172.17.0.1 +JITSI_PROSODY_HOST=172.17.0.1 JITSI_CERTS_FOLDER=/certs/ -JITSI_NAT_PUBLIC_IP=77.204.7.239 -JITSI_NAT_LOCAL_IP=192.168.0.18 +JITSI_NAT_PUBLIC_IP=37.164.35.154 +JITSI_NAT_LOCAL_IP=192.168.0.231 JITSI_VIDEO_TCP=8080 |