meissa/c4k-forgejo
6
0
Fork 0
Code Issues Pull requests Projects Releases 27 Packages Wiki Activity

Remove mailer-host-port usages

Browse source
This commit is contained in:
Clemens Geibel 2022-08-05 10:09:18 +02:00
parent e1929dd312
commit 8936b488d2
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/cljs/dda/c4k_gitea/browser.cljs
View file

@ -32,7 +32,8 @@
(cm/concat-vec (cm/concat-vec
(br/generate-input-field "fqdn" "Your fqdn:" "repo.test.de") (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-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 "service-noreply-address" "Your noreply domain:" "test.de")
(br/generate-input-field "issuer" "(Optional) Your issuer prod/staging:" "") (br/generate-input-field "issuer" "(Optional) Your issuer prod/staging:" "")
(br/generate-input-field "app-name" "(Optional) Your app name:" "") (br/generate-input-field "app-name" "(Optional) Your app name:" "")
@ -76,7 +77,8 @@
(defn validate-all! [] (defn validate-all! []
(br/validate! "fqdn" ::gitea/fqdn) (br/validate! "fqdn" ::gitea/fqdn)
(br/validate! "mailer-from" ::gitea/mailer-from) (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! "service-noreply-address" ::gitea/service-noreply-address)
(br/validate! "issuer" ::gitea/issuer :optional true :deserializer keyword) (br/validate! "issuer" ::gitea/issuer :optional true :deserializer keyword)
(br/validate! "app-name" ::gitea/default-app-name) (br/validate! "app-name" ::gitea/default-app-name)
@ -104,7 +106,8 @@
(br/set-output!))))) (br/set-output!)))))
(add-validate-listener "fqdn") (add-validate-listener "fqdn")
(add-validate-listener "mailer-from") (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 "service-noreply-address")
(add-validate-listener "app-name") (add-validate-listener "app-name")
(add-validate-listener "domain-whitelist") (add-validate-listener "domain-whitelist")

3
valid-config.edn
View file

@ -3,7 +3,8 @@
:fqdn "test.de" :fqdn "test.de"
:issuer "staging" :issuer "staging"
:mailer-from "test@test.de" :mailer-from "test@test.de"
:mailer-host-port "test.de:123" :mailer-host "test.de"
:mailer-port "123"
:service-whitelist-domains "test.de" :service-whitelist-domains "test.de"
:service-noreply-address "noreply@test.de" :service-noreply-address "noreply@test.de"
:volume-total-storage-size 6 :volume-total-storage-size 6