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

Merge branch 'main' of gitlab.com:domaindrivenarchitecture/c4k-forgejo into main

Browse source
This commit is contained in:
bom 2023-06-16 14:20:05 +02:00
commit 556a44e960
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/cljc/dda/c4k_forgejo/core.cljc
View file

@ -8,15 +8,15 @@
[dda.c4k-forgejo.backup :as backup] [dda.c4k-forgejo.backup :as backup]
[dda.c4k-common.postgres :as postgres])) [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 (def config? (s/keys :req-un [::forgejo/fqdn
::forgejo/deploy-federated
::forgejo/mailer-from ::forgejo/mailer-from
::forgejo/mailer-host ::forgejo/mailer-host
::forgejo/mailer-port ::forgejo/mailer-port
::forgejo/service-noreply-address] ::forgejo/service-noreply-address]
:opt-un [::forgejo/issuer :opt-un [::forgejo/issuer
::forgejo/deploy-federated
::forgejo/default-app-name ::forgejo/default-app-name
::forgejo/service-domain-whitelist ::forgejo/service-domain-whitelist
::backup/restic-repository ::backup/restic-repository

4
src/main/cljc/dda/c4k_forgejo/forgejo.cljc
View file

@ -45,15 +45,13 @@
(s/def ::issuer pred/letsencrypt-issuer?) (s/def ::issuer pred/letsencrypt-issuer?)
(s/def ::volume-total-storage-size (partial pred/int-gt-n? 5)) (s/def ::volume-total-storage-size (partial pred/int-gt-n? 5))
(def config-defaults {:issuer "staging"})
(def config? (s/keys :req-un [::fqdn (def config? (s/keys :req-un [::fqdn
::deploy-federated
::mailer-from ::mailer-from
::mailer-host ::mailer-host
::mailer-port ::mailer-port
::service-noreply-address] ::service-noreply-address]
:opt-un [::issuer :opt-un [::issuer
::deploy-federated
::default-app-name ::default-app-name
::service-domain-whitelist])) ::service-domain-whitelist]))

2
src/main/cljs/dda/c4k_forgejo/browser.cljs
View file

@ -110,7 +110,7 @@
(-> (cm/generate-common (-> (cm/generate-common
(config-from-document) (config-from-document)
(br/get-content-from-element "auth" :deserializer edn/read-string) (br/get-content-from-element "auth" :deserializer edn/read-string)
forgejo/config-defaults core/config-defaults
core/k8s-objects) core/k8s-objects)
(br/set-output!))))) (br/set-output!)))))
(add-validate-listener "fqdn") (add-validate-listener "fqdn")