Compare commits
5 commits
c6ac4e0bbe
...
4f6f431bc4
Author | SHA1 | Date | |
---|---|---|---|
4f6f431bc4 | |||
13f0ce6f7f | |||
b9f73c0409 | |||
7e472b7f74 | |||
940bbf7c23 |
7 changed files with 16 additions and 14 deletions
|
@ -6,7 +6,7 @@ from ddadevops import *
|
||||||
name = "c4k-jitsi"
|
name = "c4k-jitsi"
|
||||||
MODULE = "excalidraw-backend"
|
MODULE = "excalidraw-backend"
|
||||||
PROJECT_ROOT_PATH = "../.."
|
PROJECT_ROOT_PATH = "../.."
|
||||||
version = "1.5.1-SNAPSHOT"
|
version = "1.5.2-SNAPSHOT"
|
||||||
|
|
||||||
|
|
||||||
@init
|
@init
|
||||||
|
|
|
@ -6,7 +6,7 @@ from ddadevops import *
|
||||||
name = "c4k-jitsi"
|
name = "c4k-jitsi"
|
||||||
MODULE = "web"
|
MODULE = "web"
|
||||||
PROJECT_ROOT_PATH = "../.."
|
PROJECT_ROOT_PATH = "../.."
|
||||||
version = "1.5.1-SNAPSHOT"
|
version = "1.5.2-SNAPSHOT"
|
||||||
|
|
||||||
|
|
||||||
@init
|
@init
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
"name": "c4k-jitsi",
|
"name": "c4k-jitsi",
|
||||||
"description": "Generate c4k yaml for a jitsi deployment.",
|
"description": "Generate c4k yaml for a jitsi deployment.",
|
||||||
"author": "meissa GmbH",
|
"author": "meissa GmbH",
|
||||||
"version": "1.5.1-SNAPSHOT",
|
"version": "1.5.2-SNAPSHOT",
|
||||||
"homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-jitsi#readme",
|
"homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-jitsi#readme",
|
||||||
"repository": "https://www.npmjs.com/package/c4k-jitsi",
|
"repository": "https://www.npmjs.com/package/c4k-jitsi",
|
||||||
"license": "APACHE2",
|
"license": "APACHE2",
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
(defproject org.domaindrivenarchitecture/c4k-jitsi "1.5.1-SNAPSHOT"
|
(defproject org.domaindrivenarchitecture/c4k-jitsi "1.5.2-SNAPSHOT"
|
||||||
:description "jitsi c4k-installation package"
|
:description "jitsi c4k-installation package"
|
||||||
:url "https://domaindrivenarchitecture.org"
|
:url "https://domaindrivenarchitecture.org"
|
||||||
:license {:name "Apache License, Version 2.0"
|
:license {:name "Apache License, Version 2.0"
|
||||||
: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 "6.0.2"]
|
[org.domaindrivenarchitecture/c4k-common-clj "6.0.3"]
|
||||||
[hickory "0.7.1" :exclusions [viebel/codox-klipse-theme]]]
|
[hickory "0.7.1" :exclusions [viebel/codox-klipse-theme]]]
|
||||||
:target-path "target/%s/"
|
:target-path "target/%s/"
|
||||||
:source-paths ["src/main/cljc"
|
:source-paths ["src/main/cljc"
|
||||||
|
|
|
@ -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 "6.0.2"]
|
:dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "6.0.3"]
|
||||||
[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}}
|
||||||
|
|
|
@ -29,6 +29,8 @@
|
||||||
"jitsi/deployment.yaml" (rc/inline "jitsi/deployment.yaml")
|
"jitsi/deployment.yaml" (rc/inline "jitsi/deployment.yaml")
|
||||||
"jitsi/etherpad-service.yaml" (rc/inline "jitsi/etherpad-service.yaml")
|
"jitsi/etherpad-service.yaml" (rc/inline "jitsi/etherpad-service.yaml")
|
||||||
"jitsi/jvb-service.yaml" (rc/inline "jitsi/jvb-service.yaml")
|
"jitsi/jvb-service.yaml" (rc/inline "jitsi/jvb-service.yaml")
|
||||||
|
"jitsi/excalidraw-backend-service.yaml" (rc/inline "jitsi/excalidraw-backend-service.yaml")
|
||||||
|
"jitsi/excalidraw-deployment.yaml" (rc/inline "jitsi/excalidraw-deployment.yaml")
|
||||||
"jitsi/secret.yaml" (rc/inline "jitsi/secret.yaml")
|
"jitsi/secret.yaml" (rc/inline "jitsi/secret.yaml")
|
||||||
"jitsi/web-service.yaml" (rc/inline "jitsi/web-service.yaml")
|
"jitsi/web-service.yaml" (rc/inline "jitsi/web-service.yaml")
|
||||||
(throw (js/Error. "Undefined Resource!")))))
|
(throw (js/Error. "Undefined Resource!")))))
|
||||||
|
|
|
@ -43,7 +43,7 @@
|
||||||
(defn config-from-document []
|
(defn config-from-document []
|
||||||
(let [issuer (br/get-content-from-element "issuer" :optional true)
|
(let [issuer (br/get-content-from-element "issuer" :optional true)
|
||||||
mon-cluster-name (br/get-content-from-element "mon-cluster-name" :optional true)
|
mon-cluster-name (br/get-content-from-element "mon-cluster-name" :optional true)
|
||||||
mon-cluster-stage (br/get-content-from-element "mon-cluster-stage" :optional true :deserializer keyword)
|
mon-cluster-stage (br/get-content-from-element "mon-cluster-stage" :optional true)
|
||||||
mon-cloud-url (br/get-content-from-element "mon-cloud-url" :optional true)]
|
mon-cloud-url (br/get-content-from-element "mon-cloud-url" :optional true)]
|
||||||
(merge
|
(merge
|
||||||
{:fqdn (br/get-content-from-element "fqdn")}
|
{:fqdn (br/get-content-from-element "fqdn")}
|
||||||
|
@ -59,10 +59,10 @@
|
||||||
(br/validate! "fqdn" ::jitsi/fqdn)
|
(br/validate! "fqdn" ::jitsi/fqdn)
|
||||||
(br/validate! "issuer" ::jitsi/issuer :optional true)
|
(br/validate! "issuer" ::jitsi/issuer :optional true)
|
||||||
(br/validate! "mon-cluster-name" ::mon/cluster-name :optional true)
|
(br/validate! "mon-cluster-name" ::mon/cluster-name :optional true)
|
||||||
(br/validate! "mon-cluster-stage" ::mon/cluster-stage :optional true :deserializer keyword)
|
(br/validate! "mon-cluster-stage" ::mon/cluster-stage :optional true)
|
||||||
(br/validate! "mon-cloud-url" ::mon/grafana-cloud-url :optional true)
|
(br/validate! "mon-cloud-url" ::mon/grafana-cloud-url :optional true)
|
||||||
(br/validate! "auth" core/auth? :deserializer edn/read-string)
|
(br/validate! "auth" core/auth? :deserializer edn/read-string)
|
||||||
(br/set-validated!))
|
(br/set-form-validated!))
|
||||||
|
|
||||||
(defn add-validate-listener [name]
|
(defn add-validate-listener [name]
|
||||||
(-> (br/get-element-by-id name)
|
(-> (br/get-element-by-id name)
|
||||||
|
|
Loading…
Reference in a new issue