me/c4k-forgejo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update key names and defaults

Browse source
This commit is contained in:
bom 2022-07-22 10:51:01 +02:00
parent ea8ec76461
commit 0a6919f4f9
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/cljc/dda/c4k_gitea/gitea.cljc
View file

@ -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?]