diff --git a/systems/x86_64-linux/marvin/services/secrets/secrets.nix b/systems/x86_64-linux/marvin/services/secrets/secrets.nix index 316db66e..296df721 100644 --- a/systems/x86_64-linux/marvin/services/secrets/secrets.nix +++ b/systems/x86_64-linux/marvin/services/secrets/secrets.nix @@ -11,10 +11,10 @@ in { "anubis-key.age".publicKeys = marvinDefault; "authentik-env.age".publicKeys = marvinDefault; - "buildbot/gitea-token.age".publicKeys = marvinDefault; - "buildbot/oauth-secret.age".publicKeys = marvinDefault; - "buildbot/worker-password.age".publicKeys = marvinDefault; - "buildbot/workers.age".publicKeys = marvinDefault; + # "buildbot/gitea-token.age".publicKeys = marvinDefault; + # "buildbot/oauth-secret.age".publicKeys = marvinDefault; + # "buildbot/worker-password.age".publicKeys = marvinDefault; + # "buildbot/workers.age".publicKeys = marvinDefault; "forgejo/aux-docs-runner-token.age".publicKeys = marvinDefault; "forgejo/db-pw.age".publicKeys = marvinDefault; "forgejo/default-runner-token.age".publicKeys = marvinDefault; @@ -38,7 +38,6 @@ in "pingvin-secrets.age".publicKeys = marvinDefault; "planka-env.age".publicKeys = marvinDefault; "pocket-id-secrets.age".publicKeys = marvinDefault; - "tangled-knot-secrets.age".publicKeys = marvinDefault; "vaultwarden-vars.age".publicKeys = marvinDefault; "vaultwarden-pgpass.age".publicKeys = marvinDefault; "webmentiond-env.age".publicKeys = marvinDefault; diff --git a/systems/x86_64-linux/marvin/services/secrets/tangled-knot-secrets.age b/systems/x86_64-linux/marvin/services/secrets/tangled-knot-secrets.age deleted file mode 100644 index b876131a5cc424535758c688dc17ac86b82e6f2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1118 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCU7EOe^ybX17Ucgi%$ zbu+Ncj_`CUPclsja;fqSFvtq=3CT{1a54?{PcsWK2=jL}$mYt|&P}Q?^NK9ZObks) zG%xT7aP{{M3rw~sFU)q&E%tKEi8N2wPV~-l@`c$}RGg@g=9ZWl;>hJ$?pzptE~> znr*?A>62R=7#!*o>XVV3U!1LP5#^Yg>+9_2WMWa^W8f5EmS1ie>E`L=n(b{89_XiC zQWRF~8XBJE9qEx(QCVQf<(iai5@4C3Z(3B88JSh$UgT|>>78K_TvnQ&Zt9bjm~P~q zo)?r-;#pCi-}^nim3>=>9+YF=iXlU7iX zZ05@4<&hrZmXxO-8tPvdQXb}=Qx%lynwXa3nPOs;6Rw@&S?&|=US;m$l4??HZj@M* zR2-6BT;yI>F8SkQ`*5XqoMlSnQUopJ*Iqnr{;5$`utEX%rf0Ug;5<<{wny7+6|p78n`n zYf>CQsnLF7;5I^Q&jBX?p)#&=5L&BQQ{d`kyaXP zYMjL7Q&_H_Yo1sXm|vb%T#{kwo^9!8=~Cw68R%$QXc$oJnVMx7T9s+!qHP&jl^YV2 zQR3xQ>fz~~o9JU<=;N%-x1lvw8DSX7Z{;G*yEo04eg?PM0=Rat4~TVbH>Wf@_a z>uqS}91#=S&pgT;h_GRc@RT ztR3Z2sO{>mU6IZeP+VA=7VK5w;q9aEpPE~&?Nt_KQIQx?UXq>bUr`k7?q6;k5E0_+ z=#$Q+tE;O}ly4SVRG4V)m!7VjXcCl?<7g3BZdR=A=bjkk9*}6{6;xpm=wy=Q7ZS>K zgQdl1)_g6#+Nw(n=O=|Metp2EB(1;4J~UVNwECW~PSyKg*n(C|YAQsFKVaCn;QLmV zpI5ToYQ#3ja3p@-C>&C!n|0e=Mdg2YP@5?0GA8}=nMYK=?lO4nTEP6tf99owY_ETw VR*Y^vq^)Nb{NnAbjHHGJ3jhNnd_VvI diff --git a/systems/x86_64-linux/marvin/services/tangled.nix b/systems/x86_64-linux/marvin/services/tangled.nix index 0e027b14..fd7af7db 100644 --- a/systems/x86_64-linux/marvin/services/tangled.nix +++ b/systems/x86_64-linux/marvin/services/tangled.nix @@ -19,7 +19,7 @@ in listenAddr = "0.0.0.0:${toString dk.port}"; hostname = dk.extUrl; internalListenAddr = "127.0.0.1:${toString dk.intListenPort}"; - secretFile = config.age.secrets.tangled-knot-secrets.path; + owner = "did:plc:5cqzysioqzttihsnbsaxrggu"; }; }; tangled-spindle = { @@ -36,9 +36,4 @@ in openssh.settings.AllowUsers = [ "git" ]; openssh.settings.AllowGroups = [ "git" ]; }; - age.secrets.tangled-knot-secrets = { - file = ./secrets/tangled-knot-secrets.age; - owner = "git"; - group = "git"; - }; }