Feature custom stun servers

team-video/templates/deploy_jicofo.yaml

@@ -20,13 +20,24 @@ spec:
       containers:
        - name: jicofo
          image: jitsi/jicofo
+         imagePullPolicy: {{ .Values.app.pullpolicy }}
          env:
+          {{ if .Values.auth.enabled}}
+          - name: ENABLE_AUTH
+            value: "true"
+          - name: AUTH_TYPE
+            value: {{ .Values.auth.type }}
+          {{end}}
           - name: XMPP_SERVER
             value: {{ include "team-video.fullname" . }}-prosody
           - name: XMPP_DOMAIN
             value: {{ .Values.app.name }}.{{ .Values.app.domain }}
           - name: XMPP_AUTH_DOMAIN
             value: auth.{{ .Values.app.name }}.{{ .Values.app.domain }}
+            {{ if .Values.auth.guests}}
+          - name: XMPP_GUEST_DOMAIN
+            value: guest.{{ .Values.app.name }}.{{ .Values.app.domain }}
+            {{end}}
           - name: JICOFO_COMPONENT_SECRET
             value: {{ .Values.secrets.jicofo.component }}
           - name: JICOFO_AUTH_USER

team-video/templates/deploy_jvb.yaml

@@ -20,6 +20,7 @@ spec:
       containers:
        - name: jvb
          image: jitsi/jvb
+         imagePullPolicy: {{ .Values.app.pullpolicy }}
          ports:
          - containerPort: 30000
            protocol: UDP
@@ -46,10 +47,18 @@ spec:
             value: {{ .Values.secrets.jvb.auth }}
           - name: JVB_BREWERY_MUC
             value: jvbbrewery
+            {{ if .Values.auth.guests}}
+          - name: XMPP_GUEST_DOMAIN
+            value: guest.{{ .Values.app.name }}.{{ .Values.app.domain }}
+            {{end}}
           - name: XMPP_INTERNAL_MUC_DOMAIN
             value: internal-muc.{{ .Values.app.name }}.{{ .Values.app.domain }}
           - name: JVB_STUN_SERVERS
+          {{ if .Values.stun.server}}
+            value: {{ .Values.stun.server }}
+          {{else}}
             value: stun.l.google.com:19302,stun1.l.google.com:19302,stun2.l.google.com:19302
+          {{end}}
           - name: JICOFO_AUTH_USER
             value: focus
           - name: TZ

team-video/templates/deploy_prosody.yaml

@@ -25,10 +25,29 @@ spec:
           - containerPort: 5347
          resources: {}
 #         restartPolicy: Always
+         lifecycle:
+           postStart:
+             exec:
+               command: ["/bin/bash", "-c", "sleep 60; prosodyctl --config /config/prosody.cfg.lua register {{ .Values.auth.admin.user }} {{ .Values.app.name }}.{{ .Values.app.domain }} {{ .Values.auth.admin.password }}"]
          image: jitsi/prosody
+         imagePullPolicy: {{ .Values.app.pullpolicy }}
          env:
+          {{ if .Values.auth.enabled}}
+          - name: ENABLE_AUTH
+            value: "true"
+            {{ if .Values.auth.guests}}
+          - name: ENABLE_GUESTS
+            value: "true"
+            {{end}}
+          - name: AUTH_TYPE
+            value: {{ .Values.auth.type }}
+          {{end}}
           - name: XMPP_DOMAIN
             value: {{ .Values.app.name }}.{{ .Values.app.domain }}
+            {{ if .Values.auth.guests}}
+          - name: XMPP_GUEST_DOMAIN
+            value: guest.{{ .Values.app.name }}.{{ .Values.app.domain }}
+            {{end}}
           - name: XMPP_AUTH_DOMAIN
             value: auth.{{ .Values.app.name }}.{{ .Values.app.domain }}
           - name: XMPP_MUC_DOMAIN
@@ -45,6 +64,8 @@ spec:
             value: jvb
           - name: JVB_AUTH_PASSWORD
             value: {{ .Values.secrets.jvb.auth }}
+          - name: LOG_LEVEL
+            value: {{ .Values.logLevel }}
           - name: XMPP_INTERNAL_MUC_DOMAIN
             value: internal-muc.{{ .Values.app.name }}.{{ .Values.app.domain }}
           - name: TZ

team-video/templates/deploy_web.yaml

@@ -20,16 +20,35 @@ spec:
       containers:
        - name: web
          image: jitsi/web
+         imagePullPolicy: {{ .Values.app.pullpolicy }}
          ports:
           - name: web
             containerPort: 80
+        {{if .Values.hideWelcomePage}}
+         lifecycle:
+           postStart:
+             exec:
+               command: ['/bin/bash', '-c', 'sleep 60; sed -i "s/enableWelcomePage: true,/enableWelcomePage: false,/g" /config/config.js']
+        {{end}}
          env:
+          {{ if .Values.auth.enabled}}
+          - name: ENABLE_AUTH
+            value: "1"
+            {{ if .Values.auth.guests}}
+          - name: ENABLE_GUESTS
+            value: "1"
+            {{end}}
+          {{end}}
           - name: JICOFO_AUTH_USER
             value: focus
           - name: XMPP_DOMAIN
             value: {{ .Values.app.name }}.{{ .Values.app.domain }}
           - name: XMPP_AUTH_DOMAIN
             value: auth.{{ .Values.app.name }}.{{ .Values.app.domain }}
+            {{ if .Values.auth.guests}}
+          - name: XMPP_GUEST_DOMAIN
+            value: guest.{{ .Values.app.name }}.{{ .Values.app.domain }}
+            {{end}}
           - name: XMPP_BOSH_URL_BASE
             value: http://{{ include "team-video.fullname" . }}-prosody:5280
           - name: XMPP_MUC_DOMAIN

team-video/values.yaml

@@ -1,8 +1,23 @@
 app:
   name: video
   domain: example.org
+  pullpolicy: IfNotPresent
 
-  # nothing to change below this line.
+auth:
+  enabled: false
+  guests: true
+  type: "internal"
+  admin:
+    user: admin
+    password: "jitsiAdmin"
+
+logLevel: "info"
+hideWelcomePage: true
+
+stun:
+  server:
+
+  # optional changes below this line.
 secrets:
   jvb:
     component: "jsdjhjk623sxbnedrtg42315tr"

values-video.yaml

@@ -1,3 +1,18 @@
 app:
   name: video
   domain: example.org
+  pullpolicy: IfNotPresent # set to Always for auto updates
+
+auth:
+  enabled: false
+  guests: true
+  type: internal
+  admin:
+    user: admin
+    password: "jitsiAdmin"
+
+logLevel: "info"
+hideWelcomePage: true
+# Remove following # to use different stun servers
+# stun:
+#  server: stun.stunprotocol.org:3478, stun.services.mozilla.com:3478