update versions & remove deprecation
This commit is contained in:
parent
c5b802543e
commit
32284d90bd
3 changed files with 17 additions and 17 deletions
|
@ -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.2.3"]
|
||||
[org.domaindrivenarchitecture/c4k-common-clj "6.3.1"]
|
||||
[hickory "0.7.1" :exclusions [viebel/codox-klipse-theme]]]
|
||||
:target-path "target/%s/"
|
||||
:source-paths ["src/main/cljc"
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
"src/test/cljc"
|
||||
"src/test/cljs"
|
||||
"src/test/resources"]
|
||||
:dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "6.1.0"]
|
||||
:dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "6.3.1"]
|
||||
[hickory "0.7.1"]]
|
||||
:builds {:frontend {:target :browser
|
||||
:modules {:main {:init-fn dda.c4k-jitsi.browser/init}}
|
||||
|
|
|
@ -19,21 +19,21 @@
|
|||
(def config? (s/keys :req-un [::fqdn]
|
||||
:opt-un [::issuer]))
|
||||
|
||||
(def auth? (s/keys :req-un [::jvb-auth-password
|
||||
::jicofo-auth-password
|
||||
(def auth? (s/keys :req-un [::jvb-auth-password
|
||||
::jicofo-auth-password
|
||||
::jicofo-component-secret]))
|
||||
#?(:cljs
|
||||
#?(:cljs
|
||||
(defmethod yaml/load-resource :jitsi [resource-name]
|
||||
(get (inline-resources "jitsi") resource-name)))
|
||||
(get (inline-resources "jitsi") resource-name)))
|
||||
|
||||
(defn-spec generate-ingress-web cp/map-or-seq?
|
||||
[config config?]
|
||||
(ing/generate-ingress-and-cert
|
||||
(merge
|
||||
{:service-name "web"
|
||||
:service-port 80
|
||||
:fqdns [(:fqdn config)]}
|
||||
config)))
|
||||
(ing/generate-ingress-and-cert
|
||||
(merge
|
||||
{:service-name "web"
|
||||
:service-port 80
|
||||
:fqdns [(:fqdn config)]}
|
||||
config)))
|
||||
|
||||
(defn-spec generate-ingress-etherpad cp/map-or-seq?
|
||||
[config config?]
|
||||
|
@ -79,11 +79,11 @@
|
|||
(let [{:keys [fqdn]} config]
|
||||
(->
|
||||
(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_ETHERPAD_URL"
|
||||
(str "https://etherpad." fqdn "/p/"))
|
||||
(cm/replace-all-matching-values-by-new-value "REPLACE_EXCALIDRAW_BACKEND_URL"
|
||||
(str "https://excalidraw-backend." fqdn)))))
|
||||
(cm/replace-all-matching "REPLACE_JITSI_FQDN" fqdn)
|
||||
(cm/replace-all-matching "REPLACE_ETHERPAD_URL"
|
||||
(str "https://etherpad." fqdn "/p/"))
|
||||
(cm/replace-all-matching "REPLACE_EXCALIDRAW_BACKEND_URL"
|
||||
(str "https://excalidraw-backend." fqdn)))))
|
||||
|
||||
(defn-spec generate-excalidraw-deployment cp/map-or-seq? []
|
||||
(yaml/load-as-edn "jitsi/excalidraw-deployment.yaml"))
|
||||
|
|
Loading…
Reference in a new issue