From a8964d800461fb562d1c0cc04bd58c9a3ef9b175 Mon Sep 17 00:00:00 2001 From: "Ricardo (XenGi) Band" Date: Sat, 1 Aug 2026 01:02:32 +0200 Subject: [PATCH] things --- hosts/git/forgejo-runner.nix | 10 +++--- hosts/monitoring/prometheus.nix | 2 ++ secrets/forgejo-runner-token-snowden-env.age | 36 +++++++++---------- secrets/forgejo-runner-token-snowden.age | Bin 989 -> 1023 bytes 4 files changed, 25 insertions(+), 23 deletions(-) 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 7b70eebdbba7f73c20078d6975cd54e833d29b69..33ec88e84957aa7ee8eebc00cbdb1e8e14538528 100644 GIT binary patch delta 936 zcmcc1{-1q~c@g}Zk~d5M8d0<&kuA6UqXlY`Vv1wj;a;c}8c6d^dS7oYEaaNgUq_=xnAeXM4LUD11 zZfc5=si~o*f@_&iQh2#Sj&``eML}+ue^zLLftPbdhFd{Vo@b(|Wnhp;sdGwdq=|Q6 zK~kQ(ky}nSmqm6-wz+FrrbT2xVnAl8WoE8Ps9$7$dQwSbN?AmSYjT!$K}mQ)M7U|_ z#E;_PsfAvth2`Z*Nv;;*nIZb+9;v})g_-__Rff6cY5K+aiDenyj>Sf#1f zf=vv}$|~HQ{GD8ltFpBX^_`2%UA0XN142^V)4Ymv!_r;3%#9;_vx3dNz1*FW9Mkjk zjs3E7Ow05`eO!Hlf^&R*LY<;ae0@Em%%V&tpJf!U&+{$PkFp3X^+-!ib1E^>PRdKS zG|ves&q{VQE(=diw1~D0j^)Fith` z^hozN%J=m!bSW$F&Uf}ij{!IL0#n0ug}k)nV1v?-z(VKTM19LN-@GGFrwkBC&KWG=(VAP=JeUw!RTBNP3?vShPtbMMRw{SYIsj0%rT!vZgF z6OZ(a^o&qL19a<>O#L%M0u{1?ee(T-Eh{~XJcC`lOLDVKJ$;gs^OHk@^UVzOOT4Q} z>O6@!($&>f zNOf~HNJ&d~G0e;|_o?*rt~84Z*Y+?9D9S1_4^MLT@-QyV7c{;)MU|GnzCx X#OD0o`#E3EX$9l#&C^^~3orrzn7KDX delta 901 zcmey*ewTfMPQ6Q5nPo(=v2R3bL6u)>T8_I#nz?^Py0&L#Xh>0bex|;UPf&xfpPOfDQbc4>QG`o*L5`EJQGj87 zN^YoSx_7w+mseOyP<~LkU$$pOVtGNjK~R-*u$xz9np<{hW~HT1nvrK}cA;UVfp(b1 z#E;_PX63~NUddH?K9!!y+JUZSo`ya}$rZsVRUu9pCOOWg0c94IdB(|^E}5ZR$zf5R zKDpW{MG+=0#lDsiiD`y;Wya3APDO<-mgT+$+2y&pVcw-dj^VD8;~B-ngDjE@%2QJc zQX(s(BDB3Cee+W?jl&}finIOmOj3+8+?>+OJlt|zbIU`yjKV@f3fzi|D~r4fJzPAU zN>aTu9gRKH(#y=eBE8al(vmBx0$s{e11%#bpJf!U&rbI+F0zc!_s*&ED$MrqH1$jk zF$(hwtuRh1GSqj;^bgI*4M=i|vPie!iY(1{aZXS1vdm0Mt;mTAakubuDlaWf^)wDI z$qhHj@GyzU(+>&s2zAXyj{!IL0#n0u1&d10^mPB60>|Kp%IrL2NBw&93V&x~7njI_ zKsR4+OSfDPqd-r;Y)gwO6E0KB3SYAvi>k^*11IwgS6A0GGuI%eqSOL&(;QbSpO#L%M0u>UY{Ic@0@;wWq%1n*CEEDw$QVdOlEb>cBk{wF|GAoM> z>mw_*GY!(J+(NmcQVmkQ4Km!lGhMyXBaCvL{Iv6f0!*~Mvr4@KeX=uxA|k4^g9D=q z{7ulU^GNh_PE1!wH%xVL3UW8`Ovy^K^h+@{EB4BBv+z&ODl@jo3Uev(j!G-h_ckrj zugvBu2nut~HqESw@O1L`OfHQK53X=>D>W_i4D<`k&acSI&Z_dVNcSkoEp_wd($&>f z$nz}rHq5tlODl{runY|faWM!jHFh`8G0n)$Gs@J?OG!&CFf$BKDUK-STI82>`t%8g l<&}!}cgj3g;re|_e0J0}(MZ!E)h2Z>ZQiJlNj-9L(*aJfE3*Iq