Make deploy-federated optional
This commit is contained in:
parent
66dce3dd63
commit
faaed346d8
3 changed files with 4 additions and 6 deletions
|
@ -8,15 +8,15 @@
|
|||
[dda.c4k-forgejo.backup :as backup]
|
||||
[dda.c4k-common.postgres :as postgres]))
|
||||
|
||||
(def config-defaults {:issuer "staging"})
|
||||
(def config-defaults {:issuer "staging", :deploy-federated "false"})
|
||||
|
||||
(def config? (s/keys :req-un [::forgejo/fqdn
|
||||
::forgejo/deploy-federated
|
||||
::forgejo/mailer-from
|
||||
::forgejo/mailer-host
|
||||
::forgejo/mailer-port
|
||||
::forgejo/service-noreply-address]
|
||||
:opt-un [::forgejo/issuer
|
||||
::forgejo/deploy-federated
|
||||
::forgejo/default-app-name
|
||||
::forgejo/service-domain-whitelist
|
||||
::backup/restic-repository
|
||||
|
|
|
@ -45,15 +45,13 @@
|
|||
(s/def ::issuer pred/letsencrypt-issuer?)
|
||||
(s/def ::volume-total-storage-size (partial pred/int-gt-n? 5))
|
||||
|
||||
(def config-defaults {:issuer "staging"})
|
||||
|
||||
(def config? (s/keys :req-un [::fqdn
|
||||
::deploy-federated
|
||||
::mailer-from
|
||||
::mailer-host
|
||||
::mailer-port
|
||||
::service-noreply-address]
|
||||
:opt-un [::issuer
|
||||
::deploy-federated
|
||||
::default-app-name
|
||||
::service-domain-whitelist]))
|
||||
|
||||
|
|
|
@ -110,7 +110,7 @@
|
|||
(-> (cm/generate-common
|
||||
(config-from-document)
|
||||
(br/get-content-from-element "auth" :deserializer edn/read-string)
|
||||
forgejo/config-defaults
|
||||
core/config-defaults
|
||||
core/k8s-objects)
|
||||
(br/set-output!)))))
|
||||
(add-validate-listener "fqdn")
|
||||
|
|
Loading…
Reference in a new issue