meissa/c4k-website
6
5
Fork 0
Code Issues Pull requests Projects Releases 8 Packages Wiki Activity

feature/improve-start-script #2

Merged
jem merged 10 commits from feature/improve-start-script into main 2024-02-22 12:52:34 +00:00
Conversation 0 Commits 10 Files changed 17 +6 -8
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2770883473 - Show all commits

1
doc/architecture.md
View file

@ -16,5 +16,4 @@ sequenceDiagram
j ->> j: generate.sh
j ->> j: cp /target/html to website
deactivate j
```

12
src/main/cljc/dda/c4k_website/website.cljc
View file

@ -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))))))

1
src/test/cljc/dda/c4k_website/website_test.cljc
View file

@ -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",