xengi/infra
Watch
0
1
Fork
You've already forked infra
 0
Code Pull requests Activity Actions

Compare commits

base: xengi:22337fb5b12bc30a2eae635aa231aeca5cb10f93
Branches Tags
xengi:main
xengi:wip
..
compare: xengi:dfc2574653f4ccb37c0dee1fb6aa13ca23306a4e
Branches Tags
xengi:main
xengi:wip
3 changed files with 4 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hosts/forgejo-runner/forgejo-runner.nix
View file

@ -10,7 +10,6 @@
labels = [ labels = [
"debian-stable:docker://docker.io/debian:stable-slim" "debian-stable:docker://docker.io/debian:stable-slim"
"alpine-latest:docker://docker.io/alpine:latest" "alpine-latest:docker://docker.io/alpine:latest"
"nix-latest:docker://docker.io/nixos/nix:latest"
"buildkit:docker://docker.io/moby/buildkit:rootless" "buildkit:docker://docker.io/moby/buildkit:rootless"
]; ];
tokenFile = config.age.secrets.forgejo-runner-token-env.path; tokenFile = config.age.secrets.forgejo-runner-token-env.path;
@ -66,7 +65,6 @@
images=( images=(
docker.io/library/debian:stable-slim docker.io/library/debian:stable-slim
docker.io/library/alpine:latest docker.io/library/alpine:latest
docker.io/nixos/nix:latest
docker.io/moby/buildkit:latest docker.io/moby/buildkit:latest
) )
for image in "''${images[@]}"; do for image in "''${images[@]}"; do

4
hosts/monitoring/prometheus.nix
View file

@ -32,9 +32,7 @@
scrape_interval = "15s"; scrape_interval = "15s";
static_configs = [ static_configs = [
{ {
targets = [ targets = [ "sql.${config.networking.domain}:${toString config.services.prometheus.exporters.postgres.port}" ];
"sql.${config.networking.domain}:${toString config.services.prometheus.exporters.postgres.port}"
];
} }
]; ];
} }

24
secrets/secrets.nix
View file

@ -56,13 +56,7 @@ in
_sql _sql
_monitoring _monitoring
]; ];
"postgres-forgejo.age".publicKeys = "postgres-forgejo.age".publicKeys = xengi ++ kaythxbye ++ [ _sql _git ];
xengi
++ kaythxbye
++ [
_sql
_git
];
"postgres-extkuma.age".publicKeys = xengi ++ [ _sql ]; "postgres-extkuma.age".publicKeys = xengi ++ [ _sql ];
"postgres-baikal.age".publicKeys = xengi ++ [ "postgres-baikal.age".publicKeys = xengi ++ [
_sql _sql
@ -74,20 +68,8 @@ in
"caldav-export-config.age".publicKeys = xengi ++ [ _www ]; "caldav-export-config.age".publicKeys = xengi ++ [ _www ];
"radicale_htpasswd.age".publicKeys = xengi ++ [ _dav ]; "radicale_htpasswd.age".publicKeys = xengi ++ [ _dav ];
"forgejo-internal-token.age".publicKeys = xengi ++ kaythxbye ++ [ _git ]; "forgejo-internal-token.age".publicKeys = xengi ++ kaythxbye ++ [ _git ];
"forgejo-runner-token-snowden-env.age".publicKeys = "forgejo-runner-token-snowden-env.age".publicKeys = xengi ++ kaythxbye ++ [ _git _runner ];
xengi "forgejo-runner-token-snowden.age".publicKeys = xengi ++ kaythxbye ++ [ _git _runner ];
++ kaythxbye
++ [
_git
_runner
];
"forgejo-runner-token-snowden.age".publicKeys =
xengi
++ kaythxbye
++ [
_git
_runner
];
"forgejo-secret-key.age".publicKeys = xengi ++ kaythxbye ++ [ _git ]; "forgejo-secret-key.age".publicKeys = xengi ++ kaythxbye ++ [ _git ];
"forgejo-oauth2-jwt-secret.age".publicKeys = xengi ++ kaythxbye ++ [ _git ]; "forgejo-oauth2-jwt-secret.age".publicKeys = xengi ++ kaythxbye ++ [ _git ];
} }