Update key names and defaults
This commit is contained in:
parent
ea8ec76461
commit
0a6919f4f9
1 changed files with 18 additions and 18 deletions
|
@ -43,13 +43,14 @@
|
||||||
(defn-spec generate-appini-env pred/map-or-seq?
|
(defn-spec generate-appini-env pred/map-or-seq?
|
||||||
; TODO: fix this to require the merged spec of auth and config instead of any
|
; TODO: fix this to require the merged spec of auth and config instead of any
|
||||||
[config any?]
|
[config any?]
|
||||||
(let [{:keys [
|
(let [{:keys [default-app-name
|
||||||
default-app-name
|
|
||||||
fqdn
|
fqdn
|
||||||
mailer-from
|
mailer-from
|
||||||
mailer-host-port
|
mailer-host-port
|
||||||
service-whitelist-domains
|
mailer-domain-whitelist
|
||||||
service-noreply-address]}
|
service-noreply-address]
|
||||||
|
:or {default-app-name "Gitea instance"
|
||||||
|
mailer-domain-whitelist fqdn}}
|
||||||
config]
|
config]
|
||||||
(->
|
(->
|
||||||
(yaml/load-as-edn "gitea/appini-env-configmap.yaml")
|
(yaml/load-as-edn "gitea/appini-env-configmap.yaml")
|
||||||
|
@ -58,9 +59,8 @@
|
||||||
(cm/replace-all-matching-values-by-new-value "URL" (str "https://" fqdn))
|
(cm/replace-all-matching-values-by-new-value "URL" (str "https://" fqdn))
|
||||||
(cm/replace-all-matching-values-by-new-value "FROM" mailer-from)
|
(cm/replace-all-matching-values-by-new-value "FROM" mailer-from)
|
||||||
(cm/replace-all-matching-values-by-new-value "HOSTANDPORT" mailer-host-port)
|
(cm/replace-all-matching-values-by-new-value "HOSTANDPORT" mailer-host-port)
|
||||||
(cm/replace-all-matching-values-by-new-value "WHITELISTDOMAINS" service-whitelist-domains)
|
(cm/replace-all-matching-values-by-new-value "WHITELISTDOMAINS" mailer-domain-whitelist)
|
||||||
(cm/replace-all-matching-values-by-new-value "NOREPLY" service-noreply-address)
|
(cm/replace-all-matching-values-by-new-value "NOREPLY" service-noreply-address))))
|
||||||
)))
|
|
||||||
|
|
||||||
(defn-spec generate-secrets pred/map-or-seq?
|
(defn-spec generate-secrets pred/map-or-seq?
|
||||||
[auth auth?]
|
[auth auth?]
|
||||||
|
|
Loading…
Reference in a new issue