uku/flake
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(etna): fix captcha on forgejo

Browse source
This commit is contained in:
uku 2024-06-20 00:09:45 +02:00
parent f4f9d1c538
commit 68f719b7ff
Signed by: uku
SSH key fingerprint: SHA256:4P0aN6M8ajKukNi6aPOaX0LacanGYtlfjmN+m/sHY/o
3 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
secrets/etna/turnstileSecret.age Normal file
View file

@ -0,0 +1,11 @@
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpSjVjZWp5M0lMRXNNYlBk
SFFTVFVjakMzaUtkdW1JcmZLSTBlY1NJaVc4Cmx2aXFQdnk4SGJRTjZmZGNNQUJT
ZkZnZ05QVStLaW9YekdvYzdnZC9SQ1kKLT4gWDI1NTE5IENvcGJiOC9QWHAxNjJJ
S0VweVNaK294OHVJZFVPV2FCZlRBR1BjQm5VVmMKQXlPUi8zNjFJTVBFdjdOUi9z
RytwbDFtVTRCbFhWREZuMithSXJSUXNXawotPiBYMjU1MTkgL3dJVFJ3MGkzbTVq
N3BoZ0lvRnlKS0k2RHYrc3hZa082VW1Pcm9ESkxqawpJaUVtaGJxMmVNUnI1NDNI
TFdJQ2d4aWc4TXh2dHd6TDEvL01LdG1aYUhvCi0tLSBnNnFuUS9zZEk1MFNYYkxt
a29rQkg2ZGpmZnl2RnI0TE0rdS8zc2twSmljCpN1q6y8jYDL3thaSoNWFzaVkX1u
qoaCneZN4acO3oyrESyANR8zWNV/VqTr/hMOUBiyzn+Ys7l5v/y4gfTDZA6/hsQf
-----END AGE ENCRYPTED FILE-----

1
secrets/secrets.nix
View file

@ -21,4 +21,5 @@ in {
"etna/dendriteKey.age".publicKeys = main ++ [etna]; "etna/dendriteKey.age".publicKeys = main ++ [etna];
"etna/nextcloudAdminPass.age".publicKeys = main ++ [etna]; "etna/nextcloudAdminPass.age".publicKeys = main ++ [etna];
"etna/frpToken.age".publicKeys = main ++ [etna]; "etna/frpToken.age".publicKeys = main ++ [etna];
"etna/turnstileSecret.age".publicKeys = main ++ [etna];
} }

19
systems/etna/forgejo.nix
View file

@ -1,6 +1,15 @@
_: { {
config,
mkSecret,
...
}: {
cfTunnels."git.uku3lig.net" = "http://localhost:3000"; cfTunnels."git.uku3lig.net" = "http://localhost:3000";
age.secrets = mkSecret "turnstileSecret" {
owner = "forgejo";
group = "forgejo";
};
services = { services = {
forgejo = { forgejo = {
enable = true; enable = true;
@ -10,6 +19,10 @@ _: {
createDatabase = true; createDatabase = true;
}; };
secrets = {
service.CF_TURNSTILE_SECRET = config.age.secrets.turnstileSecret.path;
};
settings = { settings = {
DEFAULT.APP_NAME = "uku's forge"; DEFAULT.APP_NAME = "uku's forge";
@ -23,9 +36,9 @@ _: {
service = { service = {
ALLOW_ONLY_EXTERNAL_REGISTRATION = true; ALLOW_ONLY_EXTERNAL_REGISTRATION = true;
# TODO enable turnstile once it gets fixed
# see codeberg:forgejo/forgejo#3832
ENABLE_CAPTCHA = true; ENABLE_CAPTCHA = true;
CAPTCHA_TYPE = "cfturnstile";
CF_TURNSTILE_SITEKEY = "0x4AAAAAAAaemJiXmRluMxbQ";
}; };
oauth2 = { oauth2 = {