Turn : cleaning code

jitsi · Dec 17, 2020 · dce2fa6 · dce2fa6
1 parent 3504749
commit dce2fa6
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ FORCE_REBUILD ?= 0
 JITSI_RELEASE ?= stable
 JITSI_BUILD ?= latest
 JITSI_REPO ?= jitsi
-JITSI_SERVICES ?= base base-java web prosody jicofo jvb jigasi etherpad jibri turn
+JITSI_SERVICES ?= base base-java web prosody jicofo jvb jigasi jibri turn
 
 BUILD_ARGS := --build-arg JITSI_REPO=$(JITSI_REPO) --build-arg JITSI_RELEASE=$(JITSI_RELEASE)
 ifeq ($(FORCE_REBUILD), 1)

diff --git a/etherpad.yml b/etherpad.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
     # Etherpad: real-time collaborative document editing
     etherpad:
-        image: jitsi/etherpad:latest
+        image: etherpad/etherpad:1.8.6
         restart: ${RESTART_POLICY}
         environment:
             - TITLE="${ETHERPAD_TITLE}"

diff --git a/prosody/Dockerfile b/prosody/Dockerfile
@@ -45,9 +45,6 @@ RUN \
     && rm -rf /tmp/pkg /var/cache/apt
 
 RUN patch -d /usr/lib/prosody/modules/muc -p0 < /prosody-plugins/muc_owner_allow_kick.patch
-RUN \
-    curl -4so /prosody-plugins/mod_turncredentials.lua \
-    https://raw.githubusercontent.com/netaskd/mod_turncredentials/master/mod_turncredentials.lua
 
 COPY rootfs/ /
 

diff --git a/prosody/rootfs/defaults/prosody.cfg.lua b/prosody/rootfs/defaults/prosody.cfg.lua
@@ -186,4 +186,4 @@ turncredentials = {
     transport = "{{ .Env.TURN_TRANSPORT | default "tcp" }}"
   }
 {{ end }}
-{{ end }}
+{{ end }}
diff --git a/prosody/rootfs/etc/cont-init.d/10-config b/prosody/rootfs/etc/cont-init.d/10-config
@@ -26,7 +26,7 @@ if [[ "$(stat -c %U /prosody-plugins-custom)" != "prosody" ]]; then
 fi
 
 cp -r /defaults/* /config
-if [[ "${TURN_ENABLE}" == "1" || "${TURN_ENABLE}" == "true" ]]; then
+if [[ "${ENABLE_TURN}" == "1" || "${ENABLE_TURN}" == "true" ]]; then
      [ -z "${GLOBAL_MODULES}" ] && export GLOBAL_MODULES="turncredentials" \
      || export GLOBAL_MODULES="${GLOBAL_MODULES},turncredentials"
 fi

diff --git a/turn/Dockerfile b/turn/Dockerfile
@@ -11,4 +11,4 @@ ENTRYPOINT ["/docker-entrypoint.sh"]
 
 VOLUME ["/config"]
 
-EXPOSE 80 5349 8443 10000:11000/udp
+EXPOSE 80 5349 8443 10000:11000/udp
diff --git a/turn/rootfs/defaults/letsencrypt-renew b/turn/rootfs/defaults/letsencrypt-renew
@@ -4,4 +4,4 @@ certbot --no-self-upgrade -n renew >> /config/le-renew.log
 
 # Not sur it reload the service ...
 /bin/kill -HUP `cat /var/run/turnserver.pid 2>/dev/null` 2> /dev/null || true
-exit 0
+exit 0