meissa/c4k-jitsi
6
0
Fork 0
Code Issues Pull requests Projects Releases 11 Packages Wiki Activity

[skip ci] new jitsi versions & lein ancient checks & try for refactoring

Browse source
This commit is contained in:
Mirco 2024-08-02 14:34:54 +02:00
parent 618fbb07fc
commit 89cb9f8223
4 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
infrastructure/web/image/Dockerfile
View file

@ -1,5 +1,5 @@
# IMPORTANT: In case of base image update, "./resources/settings-config.js" also has to be updated manually! # 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 # Prepare Configuration
ADD resources /tmp ADD resources /tmp

2
project.clj
View file

@ -5,7 +5,7 @@
:url "https://www.apache.org/licenses/LICENSE-2.0.html"} :url "https://www.apache.org/licenses/LICENSE-2.0.html"}
:dependencies [[org.clojure/clojure "1.11.3"] :dependencies [[org.clojure/clojure "1.11.3"]
[org.clojure/tools.reader "1.4.2"] [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]]] [hickory "0.7.1" :exclusions [viebel/codox-klipse-theme]]]
:target-path "target/%s/" :target-path "target/%s/"
:source-paths ["src/main/cljc" :source-paths ["src/main/cljc"

10
src/main/cljc/dda/c4k_jitsi/core.cljc
View file

@ -7,9 +7,10 @@
[dda.c4k-common.predicate :as cp] [dda.c4k-common.predicate :as cp]
[dda.c4k-common.monitoring :as mon] [dda.c4k-common.monitoring :as mon]
[dda.c4k-common.yaml :as yaml] [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-cfg ::mon/mon-cfg)
(s/def ::mon-auth ::mon/mon-auth) (s/def ::mon-auth ::mon/mon-auth)
@ -30,7 +31,8 @@
(filter (filter
#(not (nil? %)) #(not (nil? %))
(cm/concat-vec (cm/concat-vec
[(jitsi/generate-secret-jitsi auth) [(ns/generate config)
(jitsi/generate-secret-jitsi auth)
(jitsi/generate-jvb-service) (jitsi/generate-jvb-service)
(jitsi/generate-web-service) (jitsi/generate-web-service)
(jitsi/generate-etherpad-service) (jitsi/generate-etherpad-service)
@ -43,4 +45,4 @@
(jitsi/generate-ingress-etherpad config) (jitsi/generate-ingress-etherpad config)
(jitsi/generate-ingress-meapp-fullstack config) (jitsi/generate-ingress-meapp-fullstack config)
(when (:contains? config :mon-cfg) (when (:contains? config :mon-cfg)
(mon/generate (:mon-cfg config) (:mon-auth auth))))))) (mon/generate-config (:mon-cfg config) (:mon-auth auth)))))))

6
src/main/resources/jitsi/deployment.yaml
View file

@ -17,7 +17,7 @@ spec:
spec: spec:
containers: containers:
- name: jicofo - name: jicofo
image: jitsi/jicofo:stable-9457-2 image: jitsi/jicofo:stable-9584-1
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: XMPP_SERVER - name: XMPP_SERVER
@ -37,7 +37,7 @@ spec:
- name: TZ - name: TZ
value: Europe/Berlin value: Europe/Berlin
- name: prosody - name: prosody
image: jitsi/prosody:stable-9457-2 image: jitsi/prosody:stable-9584-1
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: PUBLIC_URL - name: PUBLIC_URL
@ -104,7 +104,7 @@ spec:
- name: COLIBRI_WEBSOCKET_REGEX - name: COLIBRI_WEBSOCKET_REGEX
value: "127.0.0.1" value: "127.0.0.1"
- name: jvb - name: jvb
image: jitsi/jvb:stable-9457-2 image: jitsi/jvb:stable-9584-1
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: PUBLIC_URL - name: PUBLIC_URL