Compare commits

..

No commits in common. "934eda5b35b9864d36853ad25cbcdff01361906f" and "9ac0665ab4ce0c23e9ffcf3720449c7e3cd4d293" have entirely different histories.

5 changed files with 2 additions and 36 deletions

View file

@ -37,6 +37,5 @@
(jitsi/generate-deployment config)] (jitsi/generate-deployment config)]
(jitsi/generate-ingress-web config) (jitsi/generate-ingress-web config)
(jitsi/generate-ingress-etherpad config) (jitsi/generate-ingress-etherpad config)
(jitsi/generate-ingress-excalidraw-backend config)
(when (:contains? config :mon-cfg) (when (:contains? config :mon-cfg)
(mon/generate (:mon-cfg config) (:mon-auth auth))))))) (mon/generate (:mon-cfg config) (:mon-auth auth)))))))

View file

@ -51,15 +51,6 @@
:fqdns [(str "etherpad." (:fqdn config))]} :fqdns [(str "etherpad." (:fqdn config))]}
config))) config)))
(defn-spec generate-ingress-excalidraw-backend cp/map-or-seq?
[config config?]
(ing/generate-ingress-and-cert
(merge
{:service-name "excalidraw-backend"
:service-port 3002
:fqdns [(str "excalidraw-backend." (:fqdn config))]}
config)))
(defn-spec generate-secret-jitsi cp/map-or-seq? (defn-spec generate-secret-jitsi cp/map-or-seq?
[auth auth?] [auth auth?]
(let [{:keys [jvb-auth-password jicofo-auth-password jicofo-component-secret]} auth] (let [{:keys [jvb-auth-password jicofo-auth-password jicofo-component-secret]} auth]
@ -85,6 +76,4 @@
(yaml/load-as-edn "jitsi/deployment.yaml") (yaml/load-as-edn "jitsi/deployment.yaml")
(cm/replace-all-matching-values-by-new-value "REPLACE_JITSI_FQDN" fqdn) (cm/replace-all-matching-values-by-new-value "REPLACE_JITSI_FQDN" fqdn)
(cm/replace-all-matching-values-by-new-value "REPLACE_ETHERPAD_URL" (cm/replace-all-matching-values-by-new-value "REPLACE_ETHERPAD_URL"
(str "https://etherpad." fqdn "/p/")) (str "https://etherpad." fqdn "/p/")))))
(cm/replace-all-matching-values-by-new-value "REPLACE_EXCALIDRAW_BACKEND_URL"
(str "https://excalidraw-backend." fqdn)))))

View file

@ -97,10 +97,6 @@ spec:
value: "true" value: "true"
- name: ETHERPAD_PUBLIC_URL - name: ETHERPAD_PUBLIC_URL
value: REPLACE_ETHERPAD_URL value: REPLACE_ETHERPAD_URL
- name: WHITEBOARD_ENABLED
value: "true"
- name: WHITEBOARD_COLLAB_SERVER_PUBLIC_URL
value: REPLACE_EXCALIDRAW_BACKEND_URL
- name: jvb - name: jvb
image: jitsi/jvb:stable-8922-1 image: jitsi/jvb:stable-8922-1
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
@ -150,8 +146,3 @@ spec:
key: JICOFO_AUTH_PASSWORD key: JICOFO_AUTH_PASSWORD
- name: TZ - name: TZ
value: Europe/Berlin value: Europe/Berlin
- name: excalidraw-backend
image: domaindrivenarchitecture/excalidraw-backend
env:
- name: PORT
value: "3002"

View file

@ -1,13 +0,0 @@
apiVersion: v1
kind: Service
metadata:
labels:
service: excalidraw-backend
name: excalidraw-backend
spec:
ports:
- name: excalidraw-backend
port: 3002
targetPort: 3002
selector:
app: jitsi