diff --git a/project.clj b/project.clj index 4458d15..3bde1a7 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "https://www.apache.org/licenses/LICENSE-2.0.html"} :dependencies [[org.clojure/clojure "1.11.1"] [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"]] :target-path "target/%s/" :source-paths ["src/main/cljc" diff --git a/shadow-cljs.edn b/shadow-cljs.edn index a26575a..9097467 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -4,7 +4,7 @@ "src/test/cljc" "src/test/cljs" "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"]] :builds {:frontend {:target :browser :modules {:main {:init-fn dda.c4k-jitsi.browser/init}} diff --git a/src/main/cljc/dda/c4k_jitsi/jitsi.cljc b/src/main/cljc/dda/c4k_jitsi/jitsi.cljc index 8ab247c..86a8286 100644 --- a/src/main/cljc/dda/c4k_jitsi/jitsi.cljc +++ b/src/main/cljc/dda/c4k_jitsi/jitsi.cljc @@ -64,16 +64,16 @@ (yaml/from-string (yaml/load-resource "jitsi/jvb-service.yaml"))) (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? [] - (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? [config 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_ETHERPAD_URL" (str "https://etherpad." fqdn "/p/")))))