From faaed346d8879023f42364561b62402c52eb17c3 Mon Sep 17 00:00:00 2001
From: Clemens <clemens.geibel@meissa-gmbh.de.de>
Date: Fri, 16 Jun 2023 14:18:22 +0200
Subject: [PATCH] Make deploy-federated optional

---
 src/main/cljc/dda/c4k_forgejo/core.cljc    | 4 ++--
 src/main/cljc/dda/c4k_forgejo/forgejo.cljc | 4 +---
 src/main/cljs/dda/c4k_forgejo/browser.cljs | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/cljc/dda/c4k_forgejo/core.cljc b/src/main/cljc/dda/c4k_forgejo/core.cljc
index e9ddd7f..356751f 100644
--- a/src/main/cljc/dda/c4k_forgejo/core.cljc
+++ b/src/main/cljc/dda/c4k_forgejo/core.cljc
@@ -8,15 +8,15 @@
   [dda.c4k-forgejo.backup :as backup]
   [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 
-                              ::forgejo/deploy-federated
                               ::forgejo/mailer-from 
                               ::forgejo/mailer-host 
                               ::forgejo/mailer-port
                               ::forgejo/service-noreply-address]
                      :opt-un [::forgejo/issuer 
+                              ::forgejo/deploy-federated
                               ::forgejo/default-app-name 
                               ::forgejo/service-domain-whitelist
                               ::backup/restic-repository
diff --git a/src/main/cljc/dda/c4k_forgejo/forgejo.cljc b/src/main/cljc/dda/c4k_forgejo/forgejo.cljc
index f92d75f..e8ce806 100644
--- a/src/main/cljc/dda/c4k_forgejo/forgejo.cljc
+++ b/src/main/cljc/dda/c4k_forgejo/forgejo.cljc
@@ -45,15 +45,13 @@
 (s/def ::issuer pred/letsencrypt-issuer?)
 (s/def ::volume-total-storage-size (partial pred/int-gt-n? 5))
 
-(def config-defaults {:issuer "staging"})
-
 (def config? (s/keys :req-un [::fqdn
-                              ::deploy-federated
                               ::mailer-from
                               ::mailer-host
                               ::mailer-port
                               ::service-noreply-address]
                      :opt-un [::issuer
+                              ::deploy-federated
                               ::default-app-name
                               ::service-domain-whitelist]))
 
diff --git a/src/main/cljs/dda/c4k_forgejo/browser.cljs b/src/main/cljs/dda/c4k_forgejo/browser.cljs
index e5b5696..2ba8bf2 100644
--- a/src/main/cljs/dda/c4k_forgejo/browser.cljs
+++ b/src/main/cljs/dda/c4k_forgejo/browser.cljs
@@ -110,7 +110,7 @@
                               (-> (cm/generate-common
                                    (config-from-document)
                                    (br/get-content-from-element "auth" :deserializer edn/read-string)
-                                   forgejo/config-defaults
+                                   core/config-defaults
                                    core/k8s-objects)
                                (br/set-output!)))))
   (add-validate-listener "fqdn")