From 8936b488d231cb4fe95da0d0f82776e6dc6a05fc Mon Sep 17 00:00:00 2001 From: Clemens Geibel Date: Fri, 5 Aug 2022 10:09:18 +0200 Subject: [PATCH] Remove mailer-host-port usages --- src/main/cljs/dda/c4k_gitea/browser.cljs | 9 ++++++--- valid-config.edn | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/cljs/dda/c4k_gitea/browser.cljs b/src/main/cljs/dda/c4k_gitea/browser.cljs index 174d1bb..17f00c5 100644 --- a/src/main/cljs/dda/c4k_gitea/browser.cljs +++ b/src/main/cljs/dda/c4k_gitea/browser.cljs @@ -32,7 +32,8 @@ (cm/concat-vec (br/generate-input-field "fqdn" "Your fqdn:" "repo.test.de") (br/generate-input-field "mailer-from" "Your mailer email address:" "test@test.de") - (br/generate-input-field "mailer-host-port" "Your mailer host with port:" "test.de:123") + (br/generate-input-field "mailer-host" "Your mailer host address:" "test.de") + (br/generate-input-field "mailer-port" "Your mailer port number:" "123") (br/generate-input-field "service-noreply-address" "Your noreply domain:" "test.de") (br/generate-input-field "issuer" "(Optional) Your issuer prod/staging:" "") (br/generate-input-field "app-name" "(Optional) Your app name:" "") @@ -76,7 +77,8 @@ (defn validate-all! [] (br/validate! "fqdn" ::gitea/fqdn) (br/validate! "mailer-from" ::gitea/mailer-from) - (br/validate! "mailer-host-port" ::gitea/mailer-host-port) + (br/validate! "mailer-host" ::gitea/mailer-host) + (br/validate! "mailer-port" ::gitea/mailer-port) (br/validate! "service-noreply-address" ::gitea/service-noreply-address) (br/validate! "issuer" ::gitea/issuer :optional true :deserializer keyword) (br/validate! "app-name" ::gitea/default-app-name) @@ -104,7 +106,8 @@ (br/set-output!))))) (add-validate-listener "fqdn") (add-validate-listener "mailer-from") - (add-validate-listener "mailer-host-port") + (add-validate-listener "mailer-host") + (add-validate-listener "mailer-port") (add-validate-listener "service-noreply-address") (add-validate-listener "app-name") (add-validate-listener "domain-whitelist") diff --git a/valid-config.edn b/valid-config.edn index cf37f4d..6bf768e 100644 --- a/valid-config.edn +++ b/valid-config.edn @@ -3,7 +3,8 @@ :fqdn "test.de" :issuer "staging" :mailer-from "test@test.de" -:mailer-host-port "test.de:123" +:mailer-host "test.de" +:mailer-port "123" :service-whitelist-domains "test.de" :service-noreply-address "noreply@test.de" :volume-total-storage-size 6