From 45a5fab7792919eeb876b8f11e4713b7d95d53b6 Mon Sep 17 00:00:00 2001
From: Mirco <mirco.zachmann@meissa.de>
Date: Thu, 21 Sep 2023 07:47:01 +0200
Subject: [PATCH] Updated jitsi_test

---
 src/main/resources/jitsi/deployment.yaml    |  6 +-----
 src/test/cljc/dda/c4k_jitsi/jitsi_test.cljc | 20 ++++----------------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/main/resources/jitsi/deployment.yaml b/src/main/resources/jitsi/deployment.yaml
index 3f6b21d..bc97561 100644
--- a/src/main/resources/jitsi/deployment.yaml
+++ b/src/main/resources/jitsi/deployment.yaml
@@ -68,7 +68,7 @@ spec:
             - name: JVB_TCP_HARVESTER_DISABLED
               value: "true"
         - name: web
-          image: domaindrivenarchitecture/c4k-jitsi:1.3.6-SNAPSHOT
+          image: domaindrivenarchitecture/c4k-jitsi
           imagePullPolicy: IfNotPresent
           env:
             - name: PUBLIC_URL
@@ -126,8 +126,6 @@ spec:
                 secretKeyRef:
                   name: jitsi-config
                   key: JICOFO_AUTH_PASSWORD
-            - name: JVB_BREWERY_MUC
-              value: jvbbrewery
             - name: TZ
               value: Europe/Berlin
         - name: etherpad
@@ -142,8 +140,6 @@ spec:
                   key: JICOFO_COMPONENT_SECRET
             - name: JICOFO_AUTH_USER
               value: focus
-            - name: JVB_BREWERY_MUC
-              value: jvbbrewery
             - name: JICOFO_AUTH_PASSWORD
               valueFrom:
                 secretKeyRef:
diff --git a/src/test/cljc/dda/c4k_jitsi/jitsi_test.cljc b/src/test/cljc/dda/c4k_jitsi/jitsi_test.cljc
index 924668b..24d8aee 100644
--- a/src/test/cljc/dda/c4k_jitsi/jitsi_test.cljc
+++ b/src/test/cljc/dda/c4k_jitsi/jitsi_test.cljc
@@ -23,21 +23,17 @@
                :imagePullPolicy "IfNotPresent",
                :env
                [{:name "XMPP_SERVER", :value "localhost"}
-                {:name "XMPP_DOMAIN", :value "meet.jitsi"}
-                {:name "XMPP_AUTH_DOMAIN", :value "auth.meet.jitsi"}
                 {:name "JICOFO_COMPONENT_SECRET",
                  :valueFrom {:secretKeyRef {:name "jitsi-config", :key "JICOFO_COMPONENT_SECRET"}}}
                 {:name "JICOFO_AUTH_USER", :value "focus"}
                 {:name "JICOFO_AUTH_PASSWORD", :valueFrom {:secretKeyRef {:name "jitsi-config", :key "JICOFO_AUTH_PASSWORD"}}}
-                {:name "TZ", :value "Europe/Berlin"}
-                {:name "JVB_BREWERY_MUC", :value "jvbbrewery"}]}
+                {:name "TZ", :value "Europe/Berlin"}]}
               {:name "prosody",
                :image "jitsi/prosody:stable-8922-1",
                :imagePullPolicy "IfNotPresent",
                :env
-               [{:name "PUBLIC_URL", :value "xy.xy.xy"}
-                {:name "XMPP_DOMAIN", :value "meet.jitsi"}
-                {:name "XMPP_AUTH_DOMAIN", :value "auth.meet.jitsi"}
+               [{:name "XMPP_SERVER", :value "localhost"}
+                {:name "JVB_AUTH_USER", :value "jvb"}
                 {:name "JICOFO_COMPONENT_SECRET",
                  :valueFrom {:secretKeyRef {:name "jitsi-config", :key "JICOFO_COMPONENT_SECRET"}}}
                 {:name "JVB_AUTH_USER", :value "jvb"}
@@ -52,10 +48,8 @@
                :env
                [{:name "PUBLIC_URL", :value "xy.xy.xy"}
                 {:name "XMPP_SERVER", :value "localhost"}
-                {:name "JICOFO_AUTH_USER", :value "focus"}
-                {:name "XMPP_DOMAIN", :value "meet.jitsi"}
-                {:name "XMPP_AUTH_DOMAIN", :value "auth.meet.jitsi"}
                 {:name "XMPP_BOSH_URL_BASE", :value "http://127.0.0.1:5280"}
+                {:name "JICOFO_AUTH_USER", :value "focus"}
                 {:name "TZ", :value "Europe/Berlin"}
                 {:name "JVB_TCP_HARVESTER_DISABLED", :value "true"}
                 {:name "DEFAULT_LANGUAGE", :value "de"}
@@ -72,26 +66,20 @@
                [{:name "PUBLIC_URL", :value "xy.xy.xy"}
                 {:name "XMPP_SERVER", :value "localhost"}
                 {:name "DOCKER_HOST_ADDRESS", :value "xy.xy.xy"}
-                {:name "XMPP_DOMAIN", :value "meet.jitsi"}
-                {:name "XMPP_AUTH_DOMAIN", :value "auth.meet.jitsi"}
                 {:name "JICOFO_AUTH_USER", :value "focus"}
                 {:name "JVB_TCP_HARVESTER_DISABLED", :value "true"}
                 {:name "JVB_AUTH_USER", :value "jvb"}
                 {:name "JVB_PORT", :value "30300"}
                 {:name "JVB_AUTH_PASSWORD", :valueFrom {:secretKeyRef {:name "jitsi-config", :key "JVB_AUTH_PASSWORD"}}}
                 {:name "JICOFO_AUTH_PASSWORD", :valueFrom {:secretKeyRef {:name "jitsi-config", :key "JICOFO_AUTH_PASSWORD"}}}
-                {:name "JVB_BREWERY_MUC", :value "jvbbrewery"}
                 {:name "TZ", :value "Europe/Berlin"}]}
               {:name "etherpad",
                :image "etherpad/etherpad:1.9.2",
                :env
                [{:name "XMPP_SERVER", :value "localhost"}
-                {:name "XMPP_DOMAIN", :value "meet.jitsi"}
-                {:name "XMPP_AUTH_DOMAIN", :value "auth.meet.jitsi"}
                 {:name "JICOFO_COMPONENT_SECRET",
                  :valueFrom {:secretKeyRef {:name "jitsi-config", :key "JICOFO_COMPONENT_SECRET"}}}
                 {:name "JICOFO_AUTH_USER", :value "focus"}
-                {:name "JVB_BREWERY_MUC", :value "jvbbrewery"}
                 {:name "JICOFO_AUTH_PASSWORD", :valueFrom {:secretKeyRef {:name "jitsi-config", :key "JICOFO_AUTH_PASSWORD"}}}
                 {:name "TZ", :value "Europe/Berlin"}]}]}}}}
          (cut/generate-deployment {:fqdn "xy.xy.xy"}))))