fixed browser.cljs
This commit is contained in:
parent
496c008735
commit
9e19855493
2 changed files with 5 additions and 18 deletions
|
@ -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 "0.4.3"]
|
:dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "1.0.0"]
|
||||||
[hickory "0.7.1"]]
|
[hickory "0.7.1"]]
|
||||||
:builds {:frontend {:target :browser
|
:builds {:frontend {:target :browser
|
||||||
:modules {:main {:init-fn dda.c4k-shynet.browser/init}}
|
:modules {:main {:init-fn dda.c4k-shynet.browser/init}}
|
||||||
|
|
|
@ -9,21 +9,17 @@
|
||||||
(defn generate-content
|
(defn generate-content
|
||||||
[]
|
[]
|
||||||
(into [] (concat [(assoc (br/generate-needs-validation) :content
|
(into [] (concat [(assoc (br/generate-needs-validation) :content
|
||||||
(into [] (concat (br/generate-input-field "fqdn" "Your fqdn:" "shynet-neu.prod.meissa-gmbh.de")
|
(into [] (concat (br/generate-input-field "fqdn" "Your fqdn:" "shynet.prod.meissa-gmbh.de")
|
||||||
(br/generate-input-field "shynet-data-volume-path" "(Optional) Your shynet-data-volume-path:" "/var/shynet")
|
|
||||||
(br/generate-input-field "postgres-data-volume-path" "(Optional) Your postgres-data-volume-path:" "/var/postgres")
|
(br/generate-input-field "postgres-data-volume-path" "(Optional) Your postgres-data-volume-path:" "/var/postgres")
|
||||||
(br/generate-input-field "restic-repository" "(Optional) Your restic-repository:" "restic-repository")
|
|
||||||
(br/generate-input-field "issuer" "(Optional) Your issuer prod/staging:" "")
|
(br/generate-input-field "issuer" "(Optional) Your issuer prod/staging:" "")
|
||||||
[(br/generate-br)]
|
[(br/generate-br)]
|
||||||
(br/generate-text-area "auth" "Your auth.edn:" "{:postgres-db-user \"shynet\"
|
(br/generate-text-area "auth" "Your auth.edn:" "{:postgres-db-user \"shynet\"
|
||||||
:postgres-db-password \"shynet-db-password\"
|
:postgres-db-password \"shynet-db-password\"
|
||||||
:aws-access-key-id \"aws-id\"
|
:django-secret-key \"djangosecretkey\"}"
|
||||||
:aws-secret-access-key \"aws-secret\"
|
|
||||||
:restic-password \"restic-password\"}"
|
|
||||||
"5")
|
"5")
|
||||||
[(br/generate-br)]
|
[(br/generate-br)]
|
||||||
(br/generate-button "generate-button" "Generate c4k yaml"))))]
|
(br/generate-button "generate-button" "Generate c4k yaml"))))]
|
||||||
(br/generate-output "c4k-nextcloud-output" "Your c4k deployment.yaml:" "25"))))
|
(br/generate-output "c4k-shynet-output" "Your c4k deployment.yaml:" "25"))))
|
||||||
|
|
||||||
(defn generate-content-div
|
(defn generate-content-div
|
||||||
[]
|
[]
|
||||||
|
@ -33,25 +29,18 @@
|
||||||
(generate-content)})
|
(generate-content)})
|
||||||
|
|
||||||
(defn config-from-document []
|
(defn config-from-document []
|
||||||
(let [shynet-data-volume-path (br/get-content-from-element "shynet-data-volume-path" :optional true)
|
(let [postgres-data-volume-path (br/get-content-from-element "postgres-data-volume-path" :optional true)
|
||||||
postgres-data-volume-path (br/get-content-from-element "postgres-data-volume-path" :optional true)
|
|
||||||
restic-repository (br/get-content-from-element "restic-repository" :optional true)
|
|
||||||
issuer (br/get-content-from-element "issuer" :optional true :deserializer keyword)]
|
issuer (br/get-content-from-element "issuer" :optional true :deserializer keyword)]
|
||||||
(merge
|
(merge
|
||||||
{:fqdn (br/get-content-from-element "fqdn")}
|
{:fqdn (br/get-content-from-element "fqdn")}
|
||||||
(when (some? shynet-data-volume-path)
|
|
||||||
{:shynet-data-volume-path shynet-data-volume-path})
|
|
||||||
(when (some? postgres-data-volume-path)
|
(when (some? postgres-data-volume-path)
|
||||||
{:postgres-data-volume-path postgres-data-volume-path})
|
{:postgres-data-volume-path postgres-data-volume-path})
|
||||||
(when (some? restic-repository)
|
|
||||||
{:restic-repository restic-repository})
|
|
||||||
(when (some? issuer)
|
(when (some? issuer)
|
||||||
{:issuer issuer})
|
{:issuer issuer})
|
||||||
)))
|
)))
|
||||||
|
|
||||||
(defn validate-all! []
|
(defn validate-all! []
|
||||||
(br/validate! "fqdn" ::shynet/fqdn)
|
(br/validate! "fqdn" ::shynet/fqdn)
|
||||||
(br/validate! "shynet-data-volume-path" ::shynet/shynet-data-volume-path :optional true)
|
|
||||||
(br/validate! "postgres-data-volume-path" ::pgc/postgres-data-volume-path :optional true)
|
(br/validate! "postgres-data-volume-path" ::pgc/postgres-data-volume-path :optional true)
|
||||||
(br/validate! "issuer" ::shynet/issuer :optional true :deserializer keyword)
|
(br/validate! "issuer" ::shynet/issuer :optional true :deserializer keyword)
|
||||||
(br/validate! "auth" core/auth? :deserializer edn/read-string)
|
(br/validate! "auth" core/auth? :deserializer edn/read-string)
|
||||||
|
@ -73,8 +62,6 @@
|
||||||
(br/get-content-from-element "auth" :deserializer edn/read-string))
|
(br/get-content-from-element "auth" :deserializer edn/read-string))
|
||||||
(br/set-output!)))))
|
(br/set-output!)))))
|
||||||
(add-validate-listener "fqdn")
|
(add-validate-listener "fqdn")
|
||||||
(add-validate-listener "shynet-data-volume-path")
|
|
||||||
(add-validate-listener "postgres-data-volume-path")
|
(add-validate-listener "postgres-data-volume-path")
|
||||||
(add-validate-listener "restic-repository")
|
|
||||||
(add-validate-listener "issuer")
|
(add-validate-listener "issuer")
|
||||||
(add-validate-listener "auth"))
|
(add-validate-listener "auth"))
|
Loading…
Reference in a new issue