diff options
| author | Quentin <quentin@deuxfleurs.fr> | 2020-09-12 23:18:20 +0200 |
|---|---|---|
| committer | Quentin <quentin@deuxfleurs.fr> | 2020-09-12 23:18:20 +0200 |
| commit | 744fa8b8c9cfd17ee34967f70393e7597d75daa6 (patch) | |
| tree | 7e3a39aff5ad2e647f4dffdc24207a6c34ab3edc | |
| parent | c40095d02c12c9bd2dd1e0f196eddb9d31343109 (diff) | |
| parent | 7951d350354a9bcfff1b525f807b063464f2b691 (diff) | |
| download | infrastructure-744fa8b8c9cfd17ee34967f70393e7597d75daa6.tar.gz infrastructure-744fa8b8c9cfd17ee34967f70393e7597d75daa6.zip | |
Merge branch 'feature/rebase' of git.deuxfleurs.fr:Deuxfleurs/deuxfleurs.fr into feature/rebase
| -rw-r--r-- | app/build/docker-compose.yml | 2 | ||||
| -rw-r--r-- | app/build/jitsi-conference-focus/Dockerfile | 1 | ||||
| -rw-r--r-- | app/build/jitsi-conference-focus/sip-communicator.properties | 1 | ||||
| -rwxr-xr-x | app/build/jitsi-videobridge/jvb_run | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/app/build/docker-compose.yml b/app/build/docker-compose.yml index 25e994f..0e44928 100644 --- a/app/build/docker-compose.yml +++ b/app/build/docker-compose.yml @@ -53,7 +53,7 @@ services: # https://github.com/jitsi/jitsi-videobridge PREFIXV: stable/jitsi-meet_ VERSION: 4966 - image: superboum/amd64_jitsi_videobridge:v11 + image: superboum/amd64_jitsi_videobridge:v13 jitsi-xmpp: build: diff --git a/app/build/jitsi-conference-focus/Dockerfile b/app/build/jitsi-conference-focus/Dockerfile index f66c426..93301e9 100644 --- a/app/build/jitsi-conference-focus/Dockerfile +++ b/app/build/jitsi-conference-focus/Dockerfile @@ -20,5 +20,6 @@ RUN apt-get update && \ COPY --from=builder /srv/build /srv/jicofo COPY jicofo /usr/local/bin/jicofo +COPY sip-communicator.properties /root/.sip-communicator/sip-communicator.properties CMD ["/usr/local/bin/jicofo"] diff --git a/app/build/jitsi-conference-focus/sip-communicator.properties b/app/build/jitsi-conference-focus/sip-communicator.properties new file mode 100644 index 0000000..5347d51 --- /dev/null +++ b/app/build/jitsi-conference-focus/sip-communicator.properties @@ -0,0 +1 @@ +org.jitsi.jicofo.SHORT_ID=1 diff --git a/app/build/jitsi-videobridge/jvb_run b/app/build/jitsi-videobridge/jvb_run index 4514d99..c5852bc 100755 --- a/app/build/jitsi-videobridge/jvb_run +++ b/app/build/jitsi-videobridge/jvb_run @@ -36,4 +36,4 @@ EOF --domain=jitsi.deuxfleurs.fr \ --port=5347 \ --secret=${JITSI_SECRET_VIDEOBRIDGE} \ - --apis=rest,xmpp + --apis=xmpp,rest |