Minor adjustments
This commit is contained in:
parent
bbf0e17004
commit
e7a2b0e577
3 changed files with 3 additions and 5 deletions
|
@ -11,8 +11,6 @@
|
||||||
(s/def ::restic-password cm/bash-env-string?)
|
(s/def ::restic-password cm/bash-env-string?)
|
||||||
(s/def ::restic-repository cm/bash-env-string?)
|
(s/def ::restic-repository cm/bash-env-string?)
|
||||||
|
|
||||||
(def auth? (s/keys :req-un [::aws-access-key-id ::aws-secret-access-key ::restic-password ::restic-repository]))
|
|
||||||
|
|
||||||
#?(:cljs
|
#?(:cljs
|
||||||
(defmethod yaml/load-resource :backup [resource-name]
|
(defmethod yaml/load-resource :backup [resource-name]
|
||||||
(case resource-name
|
(case resource-name
|
||||||
|
|
|
@ -93,8 +93,8 @@
|
||||||
(cm/replace-all-matching-values-by-new-value "MAILERUSER" (b64/encode mailer-user))
|
(cm/replace-all-matching-values-by-new-value "MAILERUSER" (b64/encode mailer-user))
|
||||||
(cm/replace-all-matching-values-by-new-value "MAILERPW" (b64/encode mailer-pw)))))
|
(cm/replace-all-matching-values-by-new-value "MAILERPW" (b64/encode mailer-pw)))))
|
||||||
|
|
||||||
(defn-spec generate-ingress pred/map-or-seq?
|
(defn generate-ingress
|
||||||
[config config?]
|
[config]
|
||||||
(let [{:keys [fqdn issuer]} config]
|
(let [{:keys [fqdn issuer]} config]
|
||||||
(->
|
(->
|
||||||
(yaml/load-as-edn "gitea/ingress.yaml")
|
(yaml/load-as-edn "gitea/ingress.yaml")
|
||||||
|
|
|
@ -93,7 +93,7 @@
|
||||||
(br/validate! "domain-whitelist" ::gitea/service-domain-whitelist :optional true)
|
(br/validate! "domain-whitelist" ::gitea/service-domain-whitelist :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! "volume-total-storage-size" ::gitea/volume-total-storage-size :deserializer js/parseInt)
|
(br/validate! "volume-total-storage-size" ::gitea/volume-total-storage-size :deserializer js/parseInt)
|
||||||
(br/validate! "auth" gitea/auth? :deserializer edn/read-string)
|
(br/validate! "auth" core/auth? :deserializer edn/read-string)
|
||||||
(br/set-form-validated!))
|
(br/set-form-validated!))
|
||||||
|
|
||||||
(defn add-validate-listener [name]
|
(defn add-validate-listener [name]
|
||||||
|
|
Loading…
Reference in a new issue