diff --git a/hosts/git/forgejo-runner.nix b/hosts/git/forgejo-runner.nix index b9652bb..bc17c77 100644 --- a/hosts/git/forgejo-runner.nix +++ b/hosts/git/forgejo-runner.nix @@ -3,10 +3,10 @@ { services.gitea-actions-runner = { package = pkgs.forgejo-runner; - instances.yuka = { + instances.snowden = { enable = true; - name = "yuka"; - url = "https://git.sb20.xengi.de"; + name = "snowden"; + url = "https://git.berlin.ccc.de"; labels = [ "debian-stable:docker://docker.io/debian:stable-slim" "alpine-latest:docker://docker.io/alpine:latest" @@ -38,8 +38,8 @@ }; }; server.connections.forgejo = { - url = "https://git.sb20.xengi.de/"; - uuid = "f16ffc21-eb17-4595-ba54-eac00a6f1fa4"; + url = "https://git.berlin.ccc.de/"; + uuid = "7fd3683e-1bc1-429f-8467-e6d27044eb91"; token_url = "file://${config.age.secrets.forgejo-runner-token.path}"; }; container = { diff --git a/hosts/monitoring/prometheus.nix b/hosts/monitoring/prometheus.nix index 5fc243e..64c85a2 100644 --- a/hosts/monitoring/prometheus.nix +++ b/hosts/monitoring/prometheus.nix @@ -48,6 +48,7 @@ "sql.${config.networking.domain}:${toString config.services.prometheus.exporters.node.port}" "monitoring.${config.networking.domain}:${toString config.services.prometheus.exporters.node.port}" "www.${config.networking.domain}:${toString config.services.prometheus.exporters.node.port}" + "dav.${config.networking.domain}:${toString config.services.prometheus.exporters.node.port}" "git.${config.networking.domain}:${toString config.services.prometheus.exporters.node.port}" "mqtt.club.berlin.ccc.de:9100" "forgejo-runner.club.berlin.ccc.de:9100" @@ -65,6 +66,7 @@ "md.${config.networking.domain}:${toString config.services.prometheus.exporters.nginx.port}" "monitoring.${config.networking.domain}:${toString config.services.prometheus.exporters.nginx.port}" "www.${config.networking.domain}:${toString config.services.prometheus.exporters.nginx.port}" + "dav.${config.networking.domain}:${toString config.services.prometheus.exporters.nginx.port}" "git.${config.networking.domain}:${toString config.services.prometheus.exporters.nginx.port}" ]; } diff --git a/secrets/forgejo-runner-token-snowden-env.age b/secrets/forgejo-runner-token-snowden-env.age index 61774b5..07ec4ac 100644 --- a/secrets/forgejo-runner-token-snowden-env.age +++ b/secrets/forgejo-runner-token-snowden-env.age @@ -1,19 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 uH+n1w OqZFs/+8RfQcxHVYYhsTuOllqYz8vC1VVHv64y0oKxI -5hgPS2Y3pXDbs01Wi8772mHXJjeQaVryYBKEgtKxmBk --> ssh-ed25519 EvLbWw 3Kt46VGnY4ReeMRfnfoGxFxPdNw2G0NTk5UDQX4bC0I -J4eJ85bq9bTsrqbXK35TqOI/dEQgB0Om+a6G/kTx9dM --> ssh-ed25519 dM+fLQ lXxgeNxLNDI85LU54gGzxrtGmS3wvJiIWyEQWZ/TGgA -jJFc4D52KwQyaR6ghLbWL2VEtbAfHSh2gSs6JkIbtUA --> ssh-ed25519 jxWM2Q 4N/Q36JyktmQIiZnuZxen0ihw4M+GlraSbvnH9fdcAs -n9cJai680IXvkcy1yItOiBZkNL57E4mlU/98Og8P9a4 --> ssh-ed25519 /yCUCg odaQ9dbiqNlcATWIOPuyxjjZDp6nBgpKNk0cTNDpHC4 -tT67245DfpegikJT63VVTQwpaqREW440C6Y7tGW8iEo --> ssh-ed25519 FGp51g Ai1mFU3StdHeNxsuShhv9pENTI5u1ZZ3F/D2RkPDmUU -RLsCuQCPThwuLRWD3BY0zoYNMH66DMPeXf3N+T2D1N4 --> ssh-ed25519 b5OiTQ qRrLha5yq6pTIJcHso5wc4TS2Jt958t5mNQVuexlkks -64vDXNC9I6TlO1Pvho0Nuj9Nxh56vS8y5Wnwv+r+/MM --> ssh-ed25519 HaNCag TTizYb1Kw+boj0RQvrf/rwsjxmhzfg64YFCNL3umhms -MrsSQ9ukFHCCkzgu9J+HgYcP/2MHRaGA+OkwK6/YxW0 ---- kvXDCI+iHRpiJRjWfrK9omFndjVw33CH2pHthv3zrjw -? 7Gw2c8 _7߲cXB"|: \ No newline at end of file +-> ssh-ed25519 uH+n1w +KvGqAaNROyE3bbbjwH5UlsC8EEuJsVkvCx58ac+sE4 +E+ZptaFcETE4hYPeHeLTN6Nv15dURwEyvpnkTAZC3y0 +-> ssh-ed25519 EvLbWw 7SaKZybSLPBWWR5c7x+77I+3o2VSoAWXEkM402guJzw +i/2BmlC/w4AwQ9FXRPkUF4IqWjDrQIYupNtwa5FTr48 +-> ssh-ed25519 dM+fLQ ihhDunwhNoIzkgFu+GlyFXmpFnh7CPUdbqHZG1GrBk0 +2kuiVHb5xR2dZR2K3hnxEE27W8ZTULKSg7jI7Tq1AR0 +-> ssh-ed25519 jxWM2Q v6m2gYWR59bnMT0+5bJ6is0n1v+erNJIIdReaxzdYiI +IYL86COa5MQG9hFGadaMbr7tphadgsckYvchf3B1rVU +-> ssh-ed25519 /yCUCg z1FrBS/4kUxxOQl1BWcSQczVhrQ3r/zswGhR1MIBNWo +8Ivi+R3gThGkSQe4QmyFIurExpRZCyDjwVNKSYe/fDo +-> ssh-ed25519 FGp51g afHNk8lS2oJWDa5YmokpE+kD30eeSZfGb8VFc0r/H2A +pDaCkHvgFeNn3X/wDPe3yAPRV+L/g64dXEEpN+85h10 +-> ssh-ed25519 b5OiTQ I9iDVd4KcKpH+nwFNeyGSMIegsux2rDzuB+LnIYCBgk +BbptMjkV3HIisjidsfPBYLU1J1vna2QpWPiR+hkiBe0 +-> ssh-ed25519 HaNCag BUbf27o6Ph2p78kpaZO7CsCtpd6wxcBIGk4kUidsrzE +VoFu53x9AGdLDFei5C6D3Oa9UKBEdfxNh+5Nc3gGANw +--- yCHltWgEm8iJbqSTj4sd6MEkUc/KCSQCOvCqWoYgxl8 +vSZ#FY fʋʤp%I熥ESj8NMdm5NdD RВ`d\7컒 \ No newline at end of file diff --git a/secrets/forgejo-runner-token-snowden.age b/secrets/forgejo-runner-token-snowden.age index 7b70eeb..33ec88e 100644 Binary files a/secrets/forgejo-runner-token-snowden.age and b/secrets/forgejo-runner-token-snowden.age differ