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

merge conflict fixed & new jitsi versions

Browse source
This commit is contained in:
Mirco 2023-11-23 15:22:47 +01:00
parent de98e87655
commit 86756597de
3 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
infrastructure/web/image/Dockerfile
View file

@ -1,4 +1,4 @@
FROM jitsi/web:stable-8960-1 FROM jitsi/web:stable-9111
# Prepare Configuration # Prepare Configuration
ADD resources /tmp ADD resources /tmp

14
src/main/cljc/dda/c4k_jitsi/jitsi.cljc
View file

@ -1,17 +1,4 @@
(ns dda.c4k-jitsi.jitsi (ns dda.c4k-jitsi.jitsi
<<<<<<< HEAD
(:require
[clojure.spec.alpha :as s]
#?(:cljs [shadow.resource :as rc])
#?(:clj [orchestra.core :refer [defn-spec]]
:cljs [orchestra.core :refer-macros [defn-spec]])
[dda.c4k-common.yaml :as yaml]
[dda.c4k-common.common :as cm]
[dda.c4k-common.ingress :as ing]
[dda.c4k-common.base64 :as b64]
[dda.c4k-common.predicate :as cp]
#?(:cljs [dda.c4k-common.macros :refer-macros [inline-resources]])))
=======
(:require (:require
[clojure.spec.alpha :as s] [clojure.spec.alpha :as s]
#?(:clj [orchestra.core :refer [defn-spec]] #?(:clj [orchestra.core :refer [defn-spec]]
@ -22,7 +9,6 @@
[dda.c4k-common.base64 :as b64] [dda.c4k-common.base64 :as b64]
[dda.c4k-common.predicate :as cp] [dda.c4k-common.predicate :as cp]
#?(:cljs [dda.c4k-common.macros :refer-macros [inline-resources]]))) #?(:cljs [dda.c4k-common.macros :refer-macros [inline-resources]])))
>>>>>>> 89de4ed0a5b1247d387b28aebbbd357599264480
(s/def ::fqdn cp/fqdn-string?) (s/def ::fqdn cp/fqdn-string?)
(s/def ::issuer cp/letsencrypt-issuer?) (s/def ::issuer cp/letsencrypt-issuer?)

8
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-8960-1 image: jitsi/jicofo:stable-9111
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-8960-1 image: jitsi/prosody:stable-9111
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: PUBLIC_URL - name: PUBLIC_URL
@ -102,7 +102,7 @@ spec:
- name: WHITEBOARD_COLLAB_SERVER_PUBLIC_URL - name: WHITEBOARD_COLLAB_SERVER_PUBLIC_URL
value: REPLACE_EXCALIDRAW_BACKEND_URL value: REPLACE_EXCALIDRAW_BACKEND_URL
- name: jvb - name: jvb
image: jitsi/jvb:stable-8960-1 image: jitsi/jvb:stable-9111
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: PUBLIC_URL - name: PUBLIC_URL
@ -132,7 +132,7 @@ spec:
- name: TZ - name: TZ
value: Europe/Berlin value: Europe/Berlin
- name: etherpad - name: etherpad
image: etherpad/etherpad:1.9.3 image: etherpad/etherpad:1.9.4
env: env:
- name: XMPP_SERVER - name: XMPP_SERVER
value: localhost value: localhost