diff --git a/infrastructure/web/image/Dockerfile b/infrastructure/web/image/Dockerfile index bc153d4..9289959 100644 --- a/infrastructure/web/image/Dockerfile +++ b/infrastructure/web/image/Dockerfile @@ -1,5 +1,5 @@ # IMPORTANT: In case of base image update, "./resources/settings-config.js" also has to be updated manually! -FROM jitsi/web:stable-9457-2 +FROM jitsi/web:stable-9584-1 # Prepare Configuration ADD resources /tmp diff --git a/project.clj b/project.clj index f9ca9eb..be22f69 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "https://www.apache.org/licenses/LICENSE-2.0.html"} :dependencies [[org.clojure/clojure "1.11.3"] [org.clojure/tools.reader "1.4.2"] - [org.domaindrivenarchitecture/c4k-common-clj "6.3.1"] + [org.domaindrivenarchitecture/c4k-common-clj "7.0.0"] [hickory "0.7.1" :exclusions [viebel/codox-klipse-theme]]] :target-path "target/%s/" :source-paths ["src/main/cljc" diff --git a/src/main/cljc/dda/c4k_jitsi/core.cljc b/src/main/cljc/dda/c4k_jitsi/core.cljc index ffa0659..20c865c 100644 --- a/src/main/cljc/dda/c4k_jitsi/core.cljc +++ b/src/main/cljc/dda/c4k_jitsi/core.cljc @@ -7,9 +7,10 @@ [dda.c4k-common.predicate :as cp] [dda.c4k-common.monitoring :as mon] [dda.c4k-common.yaml :as yaml] - [dda.c4k-jitsi.jitsi :as jitsi])) + [dda.c4k-jitsi.jitsi :as jitsi] + [dda.c4k-common.namespace :as ns])) -(def config-defaults {:issuer "staging"}) +(def config-defaults {:issuer "staging", :namespace "jitsi"}) (s/def ::mon-cfg ::mon/mon-cfg) (s/def ::mon-auth ::mon/mon-auth) @@ -30,7 +31,8 @@ (filter #(not (nil? %)) (cm/concat-vec - [(jitsi/generate-secret-jitsi auth) + [(ns/generate config) + (jitsi/generate-secret-jitsi auth) (jitsi/generate-jvb-service) (jitsi/generate-web-service) (jitsi/generate-etherpad-service) @@ -43,4 +45,4 @@ (jitsi/generate-ingress-etherpad config) (jitsi/generate-ingress-meapp-fullstack config) (when (:contains? config :mon-cfg) - (mon/generate (:mon-cfg config) (:mon-auth auth))))))) + (mon/generate-config (:mon-cfg config) (:mon-auth auth))))))) diff --git a/src/main/resources/jitsi/deployment.yaml b/src/main/resources/jitsi/deployment.yaml index 6f2b5c2..d704a4a 100644 --- a/src/main/resources/jitsi/deployment.yaml +++ b/src/main/resources/jitsi/deployment.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: jicofo - image: jitsi/jicofo:stable-9457-2 + image: jitsi/jicofo:stable-9584-1 imagePullPolicy: IfNotPresent env: - name: XMPP_SERVER @@ -37,7 +37,7 @@ spec: - name: TZ value: Europe/Berlin - name: prosody - image: jitsi/prosody:stable-9457-2 + image: jitsi/prosody:stable-9584-1 imagePullPolicy: IfNotPresent env: - name: PUBLIC_URL @@ -104,7 +104,7 @@ spec: - name: COLIBRI_WEBSOCKET_REGEX value: "127.0.0.1" - name: jvb - image: jitsi/jvb:stable-9457-2 + image: jitsi/jvb:stable-9584-1 imagePullPolicy: IfNotPresent env: - name: PUBLIC_URL