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

Compare commits

base: uku:2842058f23ed5a98732fd650f47824d13e9bb786
Branches Tags
uku:main
..
compare: uku:8fbb9fc4cae9f79cc32903735753abe2f3c89e70
Branches Tags
uku:main

No commits in common. "2842058f23ed5a98732fd650f47824d13e9bb786" and "8fbb9fc4cae9f79cc32903735753abe2f3c89e70" have entirely different histories.
2842058f23 ... 8fbb9fc4ca

4 changed files with 13 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

24
flake.lock generated
View file

@ -37,11 +37,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733301261, "lastModified": 1733214974,
"narHash": "sha256-DhrFTYBw4dqS5ZQG9yoAUr/ibTkN3wKjgogU4I9W2a8=", "narHash": "sha256-wt0T39BRtLafAy3+IlX4ZZ8+KiZNykm9CrYO9IwTvEk=",
"owner": "uku3lig", "owner": "uku3lig",
"repo": "api-rs", "repo": "api-rs",
"rev": "e4c38c04529ca5fff3f170b8eca728ce72cfa529", "rev": "e62f892e625b8a9872d9cd7bc140f7a8962abd81",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -189,11 +189,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733304249, "lastModified": 1733299177,
"narHash": "sha256-o6wNhr1ONxMuBJUGC9v0hEjFdv5rN6XzHJEL/rQJLjA=", "narHash": "sha256-TvDEljXVpgJ7mPLyh9KKJLZkOypF+LCkcvJq/jBz9MU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6c3a7a0b72c19ec994b85c57a1712d177bd809b2", "rev": "70803283187c8f775ff561be4117e5b1a11b296e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -205,11 +205,11 @@
"hydro": { "hydro": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733306048, "lastModified": 1730549115,
"narHash": "sha256-KXch0JvfAfZfBgA8oXnYs6mRN417WvDoJN9EOZNZn10=", "narHash": "sha256-QYq4sU41/iKvDUczWLYRGqDQpVASF/+6brJJ8IxypjE=",
"owner": "jorgebucaran", "owner": "jorgebucaran",
"repo": "hydro", "repo": "hydro",
"rev": "7d0b895f8c82ee9b3710a038e0ac558d99941a72", "rev": "9c93b89573bd722f766f2190a862ae55e728f6ba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -412,11 +412,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733301392, "lastModified": 1733124015,
"narHash": "sha256-OAVSSpI6TBcu0Gr38JkD3AuO6hiEZFaB6zVy2iU9Zdg=", "narHash": "sha256-rPqOllvleOnYJaMU+zv+In7b2pTncRyRnzG7xjTZk8A=",
"owner": "uku3lig", "owner": "uku3lig",
"repo": "ukubot-rs", "repo": "ukubot-rs",
"rev": "02c6c93e4f6d2cdfcc585f34275a1863f9c8efc6", "rev": "35067c20002e73d766836e6c6fa79b8937c2fe59",
"type": "github" "type": "github"
}, },
"original": { "original": {

17
secrets/etna/vmauthEnv.age
View file

@ -1,17 +0,0 @@
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFZHdmMjdOTkFNZzY3UC83
d00xb3MwcmlSSGRtcVhYTWdWdUpsdmhQZ2xnCmE4Tkt0bzB4Z29lMTFMSzEvR0k4
VUlFVVY5RGdyaFJyS1pkc2g4VGY2VEUKLT4gWDI1NTE5IFY2SFdpdlIrYnBTd1ZX
STREdWZjQ3JOOThVNFBLRUtLUEViVnorcTJHeVUKcUJ4M09vaUlzKzM0QW5WOU0r
LzNGTEcyWEJlSnNud1h1VlJVY1VuV2dCYwotPiBYMjU1MTkgUENxTkhUSE5SUXZI
NE9SQkJTVU10RWp3YTc3d09zd05BT2ROSXhST3RVMApydlQxUjdKNkhrRG5HWVRk
eTF0QjBUVmJ4dndUbmFaZFUvM3JaZTE3djlnCi0+IFgyNTUxOSArZi9VM2dVMVRN
bjZxSk1FZlNoL0pLNFg4RGJ4Y1VlMEJGdkNTaHQyem5VCmVVaEdOQmhyOFpENWdN
WXBYN01YU0xESmMybHBocHZWTVJGc2YrZFpxdHcKLS0tIDdiTngrUHJCWU9PYVow
TVFVTUxrV1M5NFEwQzdUM0ZjMGVqaHhvM2hhbnMKlx7IO02Yx2u0jAXj/6qnUjF1
j87tucKv9X5YHkreU5u/C/x+NCvjR2SckJxJ8wDvhxeu/0WhkTWV2gG56kkf5BiT
QEA5UHkt157SIDM4FgH1VlmWr6lnhPdr+nQJB51BQNM70adOdY6qdmQ7BJ5W754G
BqnEKtZUQE+IV7esHNObKXnbkxf99KCiUxhGXHfbu/jdG/hCTBUbbEKpHGlot3xF
2XeVslCvdO49Jq24ae71fDo1/gbE2QKXgueBWU9jLXI96YCvRiqwIY7SqSz0Pr5O
bE9IRrs0rVQO
-----END AGE ENCRYPTED FILE-----

1
secrets/secrets.nix
View file

@ -30,5 +30,4 @@ in {
"etna/navidromeEnv.age".publicKeys = main ++ [etna]; "etna/navidromeEnv.age".publicKeys = main ++ [etna];
"etna/forgejoRunnerSecret.age".publicKeys = main ++ [etna]; "etna/forgejoRunnerSecret.age".publicKeys = main ++ [etna];
"etna/vaultwardenEnv.age".publicKeys = main ++ [etna]; "etna/vaultwardenEnv.age".publicKeys = main ++ [etna];
"etna/vmauthEnv.age".publicKeys = main ++ [etna];
} }

4
systems/etna/metrics.nix
View file

@ -6,12 +6,10 @@
}: let }: let
vmcfg = config.services.victoriametrics; vmcfg = config.services.victoriametrics;
secrets = _utils.setupSharedSecrets config {secrets = ["vmAuthToken"];}; secrets = _utils.setupSharedSecrets config {secrets = ["vmAuthToken"];};
vmauthEnv = _utils.setupSingleSecret config "vmauthEnv" {};
in { in {
imports = [ imports = [
mystia.nixosModules.vmauth mystia.nixosModules.vmauth
secrets.generate secrets.generate
vmauthEnv.generate
]; ];
cfTunnels = { cfTunnels = {
@ -61,7 +59,7 @@ in {
services.vmauth = { services.vmauth = {
enable = true; enable = true;
listenAddress = "127.0.0.1:9089"; listenAddress = "127.0.0.1:9089";
environmentFile = vmauthEnv.path; environmentFile = secrets.get "vmAuthToken";
authConfig.users = [ authConfig.users = [
{ {
bearer_token = "%{VM_AUTH_TOKEN}"; bearer_token = "%{VM_AUTH_TOKEN}";