diff --git a/doc/architecture.md b/doc/architecture.md index 111645b..741b82e 100644 --- a/doc/architecture.md +++ b/doc/architecture.md @@ -16,5 +16,4 @@ sequenceDiagram j ->> j: generate.sh j ->> j: cp /target/html to website deactivate j - ``` diff --git a/src/main/cljc/dda/c4k_website/website.cljc b/src/main/cljc/dda/c4k_website/website.cljc index adf78ed..0df972f 100644 --- a/src/main/cljc/dda/c4k_website/website.cljc +++ b/src/main/cljc/dda/c4k_website/website.cljc @@ -191,8 +191,8 @@ (defn-spec generate-website-build-secret pred/map-or-seq? [config websiteconfig? auth websiteauth?] - (let [{:keys [gitea-host - gitea-repo + (let [{:keys [forgejo-host + forgejo-repo branchname]} config {:keys [authtoken username]} auth] @@ -201,13 +201,13 @@ (cm/replace-all-matching-values-by-new-value "TOKEN" (b64/encode authtoken)) (cm/replace-all-matching-values-by-new-value "REPOURL" (b64/encode (generate-gitrepourl - gitea-host - gitea-repo + forgejo-host + forgejo-repo username branchname))) (cm/replace-all-matching-values-by-new-value "COMMITURL" (b64/encode (generate-gitcommiturl - gitea-host - gitea-repo + forgejo-host + forgejo-repo username)))))) diff --git a/src/test/cljc/dda/c4k_website/website_test.cljc b/src/test/cljc/dda/c4k_website/website_test.cljc index dd2210d..4487090 100644 --- a/src/test/cljc/dda/c4k_website/website_test.cljc +++ b/src/test/cljc/dda/c4k_website/website_test.cljc @@ -179,7 +179,6 @@ :GITCOMMITURL "aHR0cHM6Ly9naXRsYWIuZGUvYXBpL3YxL3JlcG9zL3NvbWV1c2VyL3JlcG8vZ2l0L2NvbW1pdHMvSEVBRA=="}} (cut/generate-website-build-secret {:fqdns ["test.de" "test.org" "www.test.de" "www.test.org"], :forgejo-repo "repo", - :sha256sum-output "123456789ab123cd345de script-file-name.sh", :issuer "staging", :branchname "main", :unique-name "test.io",