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

fix load as edn

Browse source
This commit is contained in:
jerger 2022-12-28 18:26:37 +01:00
parent 5f08a10807
commit 9b9c9cc444
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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.1"] :dependencies [[org.clojure/clojure "1.11.1"]
[org.clojure/tools.reader "1.3.6"] [org.clojure/tools.reader "1.3.6"]
[org.domaindrivenarchitecture/c4k-common-clj "4.0.0"] [org.domaindrivenarchitecture/c4k-common-clj "5.0.1"]
[hickory "0.7.1"]] [hickory "0.7.1"]]
:target-path "target/%s/" :target-path "target/%s/"
:source-paths ["src/main/cljc" :source-paths ["src/main/cljc"

2
shadow-cljs.edn
View file

@ -4,7 +4,7 @@
"src/test/cljc" "src/test/cljc"
"src/test/cljs" "src/test/cljs"
"src/test/resources"] "src/test/resources"]
:dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "4.0.0"] :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "5.0.1"]
[hickory "0.7.1"]] [hickory "0.7.1"]]
:builds {:frontend {:target :browser :builds {:frontend {:target :browser
:modules {:main {:init-fn dda.c4k-jitsi.browser/init}} :modules {:main {:init-fn dda.c4k-jitsi.browser/init}}

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

@ -64,16 +64,16 @@
(yaml/from-string (yaml/load-resource "jitsi/jvb-service.yaml"))) (yaml/from-string (yaml/load-resource "jitsi/jvb-service.yaml")))
(defn-spec generate-web-service cp/map-or-seq? [] (defn-spec generate-web-service cp/map-or-seq? []
(yaml/from-string (yaml/load-resource "jitsi/web-service.yaml"))) (yaml/load-as-edn "jitsi/web-service.yaml"))
(defn-spec generate-etherpad-service cp/map-or-seq? [] (defn-spec generate-etherpad-service cp/map-or-seq? []
(yaml/from-string (yaml/load-resource "jitsi/etherpad-service.yaml"))) (yaml/load-as-edn "jitsi/etherpad-service.yaml"))
(defn-spec generate-deployment cp/map-or-seq? (defn-spec generate-deployment cp/map-or-seq?
[config config?] [config config?]
(let [{:keys [fqdn]} config] (let [{:keys [fqdn]} config]
(-> (->
(yaml/from-string (yaml/load-resource "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/")))))