From d212d0c820199de597501b6e6d1b8ac37c6ae5db Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Wed, 19 Feb 2025 10:59:51 +0000 Subject: [PATCH 001/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index aef7599..61f5e76 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1737922006, - "narHash": "sha256-IcD9wXppeoP6SRWIJTV784XiuTKhU7SaKOH2SWscgHM=", + "lastModified": 1739961054, + "narHash": "sha256-ojss5zsq3wL809hT+Arl+XOyFdEQcdc4G/hd0YJdrUE=", "ref": "refs/heads/main", - "rev": "5fcc24a867c98be772eec8c6a65eddfbe52ab070", - "revCount": 175, + "rev": "25fcc04287741b9b9e38c82a10753a3e33138f12", + "revCount": 218, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From a7c6dde11d3fb9ac3f3ea35515defde749e6b2af Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 19 Feb 2025 11:55:35 +0000 Subject: [PATCH 002/107] feat: updated token id for teh second runner --- secrets/forgejo/runners/token2.age | Bin 1138 -> 1138 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/secrets/forgejo/runners/token2.age b/secrets/forgejo/runners/token2.age index 3c1c894e8a0d0f4dcb66440e643746d1c5610ca3..bd13ac11352095ddded648bba2cf40a7d46164f7 100644 GIT binary patch literal 1138 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5tqa74GwB%mrPKV88m%iX&oqeMT~!XV0{ zJUc0)*sU_nI3+N}C_gJK#oREhAS=r-+tA-U!-OltJH0H}(bqW9&@rVr!?Cy`IY_(8 z+&`?aBH7|M}xAUbcG_*^kAP#A0vx03uoi(B!lwAjG&_Q zOt+wdP`^~OAQy{>l1gJkzcQc9d@f7#!cs3MvvkYSjN&X)gObA3RNsK8kbGmm$TIgz zcYo7di=u*J53kI`a&*6$`lVPJmn#_fdl+ly8krks1(v!;CYMDNex+GS4mAK~wJ4fUN zxcfQ=S)kiiXp!obo~~fv=v)+@>k;4=7FO&P>gns^=@c27Ym}5*Y*HEFXd3RFn&xR) zRi5V>=*X2>Wn7+OTICd+o2g%vTWDxn=w)b76y#HwmTnPfT;!G+YMPxxS^?eYH^isu(`Xtv15`^T0}u+Nin)@X_<+JseuYr zrCz25iKb!t?s3ciDee%`Z?uUp&8D3#aSt-5$RmMQJGGbCgE;* z`j!TH24-Q!euhc;Zsp<5`hiBN`X#w8-W~;kIX(q>h8TWxF7yv^4^(iA(9W;OD)GxK z&W@;bFLo@BNVN1Ri;D6H@HeRn%lCFk@=Y`Lv&=0COXo7RwDbrz%nK^c&-MyWb@$KA zcJeJxHYiPsiV95i@e8XmH?DLs@(;)}_C)tvX;hVyak@gbex-JCRCZFOyMBpVmXS$L zaba?Sp-Z5Xqf3>urEi|AMUJh{p;=i)Nj8_RuC79;qfcsXN{U%Xuve~2fw`%#Z$XZ>W2U!HZmFqP zc9})Exld6=L}<3RTOgO(tF0ch?$3$O6TT4Pe?hkS%O#f^ON#zpRlGE3>iVMJTbFxF y-HJ4Mb-259k!aG%(|a~aWqw?4T*dg-r{Yg(Cd2K<*n?W1lL~?sb5+ldi~s<834Nyk literal 1138 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5wB24R-Y_ z(l$>?vMkY0ElBoF@psHBGAb-FDGK%o&o9U>4K~)VsI1bih~#q4N%J?!j0_1%^(-*U zDhqWg3@k0lj;Jt+2=da_F12tiE-vs(af!0XE=RY`B%mrPKV2cPD$q1DATv0)s5IXt zSUbSQ&r@69EFjM_(lsy7Eu<{3sKVPM+$hT1IFc(f#5JU(II%R@EIG&5$G|Kj-?zv- zJ2S7?KeH$_D8$t{%}GC?$}7<=#01^86i0)ypmc>$=YWv($P6QW3$KvGtegd%KVOejlc)+$7f+uGPj^QjLkq6JEQ6?E{Y<~|(qday&C7}m$|EvTg0i_>^-Ifq(+d0p%EI%D!-GwV4K32ND{@mS0+S284E$VO4E>Bv z3w%sHvpmslE3`=UN>5iP2oBc{GW5xEOmPnJ(XT8vjIcD$3J!MGPERx}$Z)dAj4X8Y zGW1L~s4VC5bj#5;v@|Wx4@>gMsxmSzH_oka3dqhXNlMF3HFnm{icCxn5BK&j$i(oQ zcUX}{QMrP5T0pV3p{Jv{uX##jVRmS^Wm!q3c14c9MNYnNluLS;TWYF)RFJltfiG8X zh__{BR$!2!MWT0FxqgLfN?LKAdqjYDMWIWkVUl-1mQk)xiIY)8I!3&uWhNS?1}gZP z=Q##DWm_h@=SJoFdZZZ|ntC}VRyn#>7?%WV7kh>|nOJ(~MC6o&Cv!!5nOI~Nh6Q^C z=I7^>Bt?{!Yv<>9JDWsBl~^WP8ifQIl?EDA1o=A#M52eJbD@8Td!T}Is%K$hNxEZ_ zTd+mGU!`%HzrR8L4>7ad6-dEQbC|cvVXFtvoBYnqlbUCTXB-FX8@PGp2emv#>M7F>0$2aIqt^h!3L==KA|D5 zRi%|ip_YD0nFhv*{$9r6Cdpj7y1EKQ+0GSFem<$*o|YcIeo=YlnQlReK8B9Po}rN? z5s_XY`jM4hhM~Seg~?osVFj0T3)c15d};f6?_PXK{-1LX5J; xS>8P|_bRHw`EKpn%q=<9z5mZUx9_&6V>5S0p0SSf&wR;urgn+f% Date: Wed, 19 Feb 2025 12:03:03 +0000 Subject: [PATCH 003/107] tmp: remove ariia from active deployment Thankfully this server is ephemeral --- machines/ariia.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/machines/ariia.nix b/machines/ariia.nix index 121dd63..724d115 100644 --- a/machines/ariia.nix +++ b/machines/ariia.nix @@ -34,7 +34,9 @@ in { targetPort = 22; targetUser = null; - tags = ["active-core"]; + tags = [ + # "active-core" + ]; }; services.skynet = { From 28843e5c8a57227c9b6b7b41360f32f3e9d6da19 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Wed, 19 Feb 2025 12:42:01 +0000 Subject: [PATCH 004/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 61f5e76..0eb2887 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1739961054, - "narHash": "sha256-ojss5zsq3wL809hT+Arl+XOyFdEQcdc4G/hd0YJdrUE=", + "lastModified": 1739968720, + "narHash": "sha256-KyDeIzhAZA5LVG5OV6MPftbaJqQVdmFFSBkTd4+rtzk=", "ref": "refs/heads/main", - "rev": "25fcc04287741b9b9e38c82a10753a3e33138f12", - "revCount": 218, + "rev": "8645a9b3ce01129d2db4981c83493e0acac2c14a", + "revCount": 220, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From d03d45143c8aba9ac825540dc2a74848b9e6e93b Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Wed, 19 Feb 2025 22:41:16 +0000 Subject: [PATCH 005/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 0eb2887..22929f4 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1739968720, - "narHash": "sha256-KyDeIzhAZA5LVG5OV6MPftbaJqQVdmFFSBkTd4+rtzk=", + "lastModified": 1740004599, + "narHash": "sha256-xVSjBplK98+OycOudlopTDFV+Uj9kS3xGSBn1mn5wz8=", "ref": "refs/heads/main", - "rev": "8645a9b3ce01129d2db4981c83493e0acac2c14a", - "revCount": 220, + "rev": "348020ecfee0963ef97458db25d16f5ddf1653a9", + "revCount": 221, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 62ea725950525c7498b977bb5c6ee2aceb49bd0e Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 24 Feb 2025 17:01:53 +0000 Subject: [PATCH 006/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 22929f4..32dfcad 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1740004599, - "narHash": "sha256-xVSjBplK98+OycOudlopTDFV+Uj9kS3xGSBn1mn5wz8=", + "lastModified": 1740415462, + "narHash": "sha256-uIYEHckBibf6FvFeF2GllzbbHXL47Vf3D76GnaVdD14=", "ref": "refs/heads/main", - "rev": "348020ecfee0963ef97458db25d16f5ddf1653a9", - "revCount": 221, + "rev": "9ce5b8136b42b5a390381e5aa08f9ec2fb7a053f", + "revCount": 222, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From f365a6770ac08ca2605670f9486b523f2030b548 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 24 Feb 2025 17:15:37 +0000 Subject: [PATCH 007/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 32dfcad..a187f09 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1740415462, - "narHash": "sha256-uIYEHckBibf6FvFeF2GllzbbHXL47Vf3D76GnaVdD14=", + "lastModified": 1740416846, + "narHash": "sha256-SFoMn+bL1b/KxoXWuyLHy6mlGDlYfnj16Bp1VmL3ph0=", "ref": "refs/heads/main", - "rev": "9ce5b8136b42b5a390381e5aa08f9ec2fb7a053f", - "revCount": 222, + "rev": "6481fcb89fa7684cb22d083812ce829730f1f309", + "revCount": 223, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From bee0c476e8619286aa8b2bfed26a54801cd6fc4f Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 24 Feb 2025 17:33:35 +0000 Subject: [PATCH 008/107] Updated flake for skynet_ldap_backend --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index a187f09..0af1f3e 100644 --- a/flake.lock +++ b/flake.lock @@ -924,11 +924,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1731940725, - "narHash": "sha256-W909eUlyTlvS/ty5Ns4p042NuSMppbC0N19zGpVCG0w=", + "lastModified": 1740417868, + "narHash": "sha256-huFGMY58DU5vh4n9KZUpxkvRr+xe5eqqjaHphZdGJV8=", "ref": "refs/heads/main", - "rev": "0b397369d185edee7d890f09786fd3450355d89c", - "revCount": 235, + "rev": "faa6233ecb734ca567ca25a40299e7fa54bac7f0", + "revCount": 236, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/ldap_backend" }, From 87469cc6c31d2dca91af59651f138e169e6152f1 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Tue, 25 Feb 2025 17:40:01 +0000 Subject: [PATCH 009/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 0af1f3e..3efeecf 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1740416846, - "narHash": "sha256-SFoMn+bL1b/KxoXWuyLHy6mlGDlYfnj16Bp1VmL3ph0=", + "lastModified": 1740504873, + "narHash": "sha256-I0XkJmBzEYOeskh4P8K0XA8NMPE/A2iEC9K7IszJfvA=", "ref": "refs/heads/main", - "rev": "6481fcb89fa7684cb22d083812ce829730f1f309", - "revCount": 223, + "rev": "b67894fc6e7d883aa24a004a4f19fcb47dc40f5e", + "revCount": 224, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 51eab3faf85dfa5eb6799b99c488fc63c58049df Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 25 Feb 2025 23:14:30 +0000 Subject: [PATCH 010/107] feat: create a vanity URL for teh committee server --- applications/skynet.ie/skynet.ie.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix index cb2e778..5082080 100644 --- a/applications/skynet.ie/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -25,6 +25,7 @@ in { services.skynet.acme.domains = [ "www.skynet.ie" "discord.skynet.ie" + "*.discord.skynet.ie" "public.skynet.ie" ]; @@ -50,6 +51,11 @@ in { r_type = "CNAME"; value = config.services.skynet.host.name; } + { + record = "*.discord"; + r_type = "CNAME"; + value = config.services.skynet.host.name; + } ]; services.nginx = { @@ -78,6 +84,16 @@ in { useACMEHost = "skynet"; locations."/".return = "307 https://discord.gg/mkuKJkCuyM"; }; + "compsoc.discord.skynet.ie" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/".return = "307 https://discord.gg/mkuKJkCuyM"; + }; + "committee.discord.skynet.ie" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/".return = "307 https://discord.gg/D6mbASJKxU"; + }; "public.skynet.ie" = { forceSSL = true; From fbb77fda9db9f92e4d13ab31d90144e9cd8eabac Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Wed, 26 Feb 2025 14:50:50 +0000 Subject: [PATCH 011/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 3efeecf..8232a57 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1740504873, - "narHash": "sha256-I0XkJmBzEYOeskh4P8K0XA8NMPE/A2iEC9K7IszJfvA=", + "lastModified": 1740581082, + "narHash": "sha256-En4BRHTocnYml3LGCgP2wF6JxfThSyNsUYX7TzLenWA=", "ref": "refs/heads/main", - "rev": "b67894fc6e7d883aa24a004a4f19fcb47dc40f5e", - "revCount": 224, + "rev": "09ce45f70fcb088baccef85535af5ffd86d336ff", + "revCount": 225, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 39b72522f34e6054d7f89251605b682c9d1ea667 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Wed, 26 Feb 2025 16:01:07 +0000 Subject: [PATCH 012/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 8232a57..79d9445 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1740581082, - "narHash": "sha256-En4BRHTocnYml3LGCgP2wF6JxfThSyNsUYX7TzLenWA=", + "lastModified": 1740585342, + "narHash": "sha256-/8yS/itZ/qI77yQBg8DqHaTwJoCUKxik62t4AzupxZM=", "ref": "refs/heads/main", - "rev": "09ce45f70fcb088baccef85535af5ffd86d336ff", - "revCount": 225, + "rev": "7406f0e6206b3fcec4c471949d6c428503fa9e91", + "revCount": 226, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From fbfdb84a1a03515ca29e913d5be76c21d2df55ae Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Wed, 26 Feb 2025 17:08:11 +0000 Subject: [PATCH 013/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 79d9445..2bd6cdd 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1740585342, - "narHash": "sha256-/8yS/itZ/qI77yQBg8DqHaTwJoCUKxik62t4AzupxZM=", + "lastModified": 1740589618, + "narHash": "sha256-bnpYreruqF9tq8pRWRivaTC2J7f6EgHhqYp7rtSzFXg=", "ref": "refs/heads/main", - "rev": "7406f0e6206b3fcec4c471949d6c428503fa9e91", - "revCount": 226, + "rev": "6a5f651ba2419639323e6c7d7219b82d4b8a7f9d", + "revCount": 229, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 19fbcaa51db1b3ead42617e223a42454e146ea06 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Fri, 28 Feb 2025 00:10:26 +0000 Subject: [PATCH 014/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 2bd6cdd..477c2b2 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1740589618, - "narHash": "sha256-bnpYreruqF9tq8pRWRivaTC2J7f6EgHhqYp7rtSzFXg=", + "lastModified": 1740701157, + "narHash": "sha256-EXW+GvlA+i19n39RQR7hFrbg2KvqBQX8ldfw6CvVI8k=", "ref": "refs/heads/main", - "rev": "6a5f651ba2419639323e6c7d7219b82d4b8a7f9d", - "revCount": 229, + "rev": "b43f760fb1ff965e171bbde0440531ac17e46a9b", + "revCount": 236, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 9d57662b160d38d7f99d24f784727b7cf0768093 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Fri, 28 Feb 2025 11:02:17 +0000 Subject: [PATCH 015/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 477c2b2..cac7d90 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1740701157, - "narHash": "sha256-EXW+GvlA+i19n39RQR7hFrbg2KvqBQX8ldfw6CvVI8k=", + "lastModified": 1740740324, + "narHash": "sha256-GOn77Y8MgAdmHNFAOAOBv7ji9+KXPxvauFGcm1dSjS4=", "ref": "refs/heads/main", - "rev": "b43f760fb1ff965e171bbde0440531ac17e46a9b", - "revCount": 236, + "rev": "058f8a7a7dc04bd9dcb26105b2a07e711fad9b93", + "revCount": 237, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From a9ea0583a7579451fa28b305e41c4dfa743c6cb9 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 3 Mar 2025 18:33:09 +0000 Subject: [PATCH 016/107] committee: removed Emily and Sean --- config/users.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/users.nix b/config/users.nix index 51ec6d2..ea5ff0a 100644 --- a/config/users.nix +++ b/config/users.nix @@ -55,8 +55,6 @@ in { "silver" "eoghanconlon73" "nanda" - "emily1999" - "dgr" ] # Committee - OCM ++ [ From 1d946308b6814c082c560c7b5de757f5994b2a37 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 3 Mar 2025 18:34:53 +0000 Subject: [PATCH 017/107] feat: scream test for Gitlab --- machines/glados.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/machines/glados.nix b/machines/glados.nix index 5e499d8..c5be714 100644 --- a/machines/glados.nix +++ b/machines/glados.nix @@ -26,7 +26,6 @@ Notes: Each user has roughly 20gb os storage }; in { imports = [ - ../applications/git/gitlab.nix ../applications/git/forgejo.nix ../applications/git/forgejo_runner.nix ]; @@ -42,7 +41,6 @@ in { services.skynet = { host = host; backup.enable = true; - gitlab.enable = true; forgejo.enable = true; forgejo_runner = { enable = true; From 6fba8bdec4835ffb4c3246a5327c6fe2ee3fe263 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 3 Mar 2025 23:01:15 +0000 Subject: [PATCH 018/107] Updated flake for skynet_ldap_backend --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index cac7d90..02beeb2 100644 --- a/flake.lock +++ b/flake.lock @@ -924,11 +924,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1740417868, - "narHash": "sha256-huFGMY58DU5vh4n9KZUpxkvRr+xe5eqqjaHphZdGJV8=", + "lastModified": 1741042377, + "narHash": "sha256-DdoRaiqXTu49D3VR6Xf8Ms5LBUhtjiLokwmVZpjrAlQ=", "ref": "refs/heads/main", - "rev": "faa6233ecb734ca567ca25a40299e7fa54bac7f0", - "revCount": 236, + "rev": "9178a16f95a872562f3e022842fb66a7c633db51", + "revCount": 237, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/ldap_backend" }, From 2790848de9b5de155c920adeb955599c316b29fc Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Tue, 4 Mar 2025 10:50:26 +0000 Subject: [PATCH 019/107] Updated flake for skynet_ldap_backend --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 02beeb2..d4a4318 100644 --- a/flake.lock +++ b/flake.lock @@ -924,10 +924,10 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1741042377, - "narHash": "sha256-DdoRaiqXTu49D3VR6Xf8Ms5LBUhtjiLokwmVZpjrAlQ=", + "lastModified": 1741084972, + "narHash": "sha256-YiiAXFN6hhA2h5IQx7FCHnDYookYqNLYS6a/gYVq3OM=", "ref": "refs/heads/main", - "rev": "9178a16f95a872562f3e022842fb66a7c633db51", + "rev": "d0d25b77e8aff7f10aaea5a4c8415b47934b3f1d", "revCount": 237, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/ldap_backend" From b195208462dec8440d02ebec6f03464578cfa99d Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Tue, 4 Mar 2025 23:42:09 +0000 Subject: [PATCH 020/107] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index d4a4318..7267d0d 100644 --- a/flake.lock +++ b/flake.lock @@ -148,11 +148,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1732723930, - "narHash": "sha256-25w50gGNTIyPgkcQa39XSFFX8gYVVniL01CX+IXfC8w=", + "lastModified": 1741131635, + "narHash": "sha256-W65UdgryecEzfS6myQ+1Sj5P3yBCJRlGRf+fU78Ei2g=", "ref": "refs/heads/main", - "rev": "744777c990434c9a84304ce6fd8c4582e6078a4c", - "revCount": 110, + "rev": "b5089910d0d0b303b634c7e125ac0b9ba8728bd9", + "revCount": 111, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 4d83ecb584baabbea6485559a28710eed6c692f3 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 6 Mar 2025 13:14:40 +0000 Subject: [PATCH 021/107] feat: we have to handle the old lists domains --- applications/email.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/applications/email.nix b/applications/email.nix index 519f3e0..4d0c905 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -50,6 +50,10 @@ with lib; let account = "contact"; members = ["committee"]; } + { + account = "committee"; + members = ["committee"]; + } { account = "dbadmin"; members = ["admin"]; @@ -291,6 +295,12 @@ in { # the number is the priority in teh case of multiple mailservers value = "10 mail.${cfg.domain}."; } + { + record = "@"; + r_type = "MX"; + # the number is the priority in teh case of multiple mailservers + value = "10 lists.${cfg.domain}."; + } # basic one { @@ -298,6 +308,11 @@ in { r_type = "A"; value = config.services.skynet.host.ip; } + { + record = "lists"; + r_type = "A"; + value = config.services.skynet.host.ip; + } #DNS config for K-9 Mail { record = "imap"; @@ -429,6 +444,7 @@ in { fqdn = "${cfg.sub}.${cfg.domain}"; domains = [ cfg.domain + "lists.skynet.ie" ]; enableManageSieve = true; From 02969ba8947f744208adc7db8f3aa0750c2fd63b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 6 Mar 2025 13:15:13 +0000 Subject: [PATCH 022/107] feat: added milan to teh sistem committee --- config/users.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/users.nix b/config/users.nix index ea5ff0a..fe8063a 100644 --- a/config/users.nix +++ b/config/users.nix @@ -67,6 +67,7 @@ in { # Committee - SISTEM ++ [ "peace" + "milan" ] # Admins are part of Committee as well ++ cfg.admin From 1ef8b0ddcede57217c0451607dffc5f57511e63d Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Thu, 6 Mar 2025 19:27:40 +0000 Subject: [PATCH 023/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 7267d0d..81d7dd4 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1740740324, - "narHash": "sha256-GOn77Y8MgAdmHNFAOAOBv7ji9+KXPxvauFGcm1dSjS4=", + "lastModified": 1741288877, + "narHash": "sha256-11cMTAJyWoBAL3AaR57xHdFn4HYXtd7FBrbA1l21usQ=", "ref": "refs/heads/main", - "rev": "058f8a7a7dc04bd9dcb26105b2a07e711fad9b93", - "revCount": 237, + "rev": "3a39084f407392ea7f7c6a797bd0b4567d2c5f1d", + "revCount": 238, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From f41221f67b7541aff3953e3e1428da7b83275c71 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Thu, 6 Mar 2025 21:45:11 +0000 Subject: [PATCH 024/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 81d7dd4..7482172 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1741288877, - "narHash": "sha256-11cMTAJyWoBAL3AaR57xHdFn4HYXtd7FBrbA1l21usQ=", + "lastModified": 1741297347, + "narHash": "sha256-X+yD0wk7vHsT6MNL2yoTVqs7tv2x/FiY99CcXlGOoyY=", "ref": "refs/heads/main", - "rev": "3a39084f407392ea7f7c6a797bd0b4567d2c5f1d", - "revCount": 238, + "rev": "f307fcea43fe0d002c96921fb4b819c8e78cca84", + "revCount": 243, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 6788aa249dd75ea0dbe3909719111630b03f5158 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Tue, 11 Mar 2025 01:19:31 +0000 Subject: [PATCH 025/107] Updated flake for skynet_ldap_backend --- flake.lock | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 7482172..f30fc54 100644 --- a/flake.lock +++ b/flake.lock @@ -492,11 +492,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1686572087, - "narHash": "sha256-jXTut7ZSYqLEgm/nTk7TuVL2ExahTip605bLINklAnQ=", + "lastModified": 1739824009, + "narHash": "sha256-fcNrCMUWVLMG3gKC5M9CBqVOAnJtyRvGPxptQFl5mVg=", "owner": "nix-community", "repo": "naersk", - "rev": "8507af04eb40c5520bd35d9ce6f9d2342cea5ad1", + "rev": "e5130d37369bfa600144c2424270c96f0ef0e11d", "type": "github" }, "original": { @@ -559,11 +559,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1687011986, - "narHash": "sha256-ZNSi/wBw12d7LO8YcZ4aehIlPp4lgSkKbrHaoF80IKI=", + "lastModified": 1741462378, + "narHash": "sha256-ZF3YOjq+vTcH51S+qWa1oGA9FgmdJ67nTNPG2OIlXDc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c09e8eb8717e240ef9c5727c1cc9186db9fb309", + "rev": "2d9e4457f8e83120c9fdf6f1707ed0bc603e5ac9", "type": "github" }, "original": { @@ -573,16 +573,16 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1686921029, - "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.05", + "ref": "nixos-unstable", "type": "indirect" } }, @@ -924,11 +924,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1741084972, - "narHash": "sha256-YiiAXFN6hhA2h5IQx7FCHnDYookYqNLYS6a/gYVq3OM=", + "lastModified": 1741655438, + "narHash": "sha256-oUpa/82OF6YJJ2Aj52P0IQZGw0MH+bKGyacnRQycL+Q=", "ref": "refs/heads/main", - "rev": "d0d25b77e8aff7f10aaea5a4c8415b47934b3f1d", - "revCount": 237, + "rev": "b00b5cac6d119a30fa60a1703d3e526985015477", + "revCount": 244, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/ldap_backend" }, @@ -1392,11 +1392,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { From 970c449efbc87f1b158e7cefb870adb1b6c3cbd4 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Tue, 11 Mar 2025 11:15:58 +0000 Subject: [PATCH 026/107] Updated flake for skynet_ldap_backend --- flake.lock | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index f30fc54..b5364ce 100644 --- a/flake.lock +++ b/flake.lock @@ -557,6 +557,22 @@ "type": "indirect" } }, + "nixpkgs-mozilla": { + "flake": false, + "locked": { + "lastModified": 1740762144, + "narHash": "sha256-I7a6e3IYJAp9u3PwUSW1+oilO1tAfnbeN3/YJQ+ObCo=", + "owner": "mozilla", + "repo": "nixpkgs-mozilla", + "rev": "e35b0e071cae97469d80222be988fdd972b22c3b", + "type": "github" + }, + "original": { + "owner": "mozilla", + "repo": "nixpkgs-mozilla", + "type": "github" + } + }, "nixpkgs_10": { "locked": { "lastModified": 1741462378, @@ -921,14 +937,15 @@ "inputs": { "naersk": "naersk_3", "nixpkgs": "nixpkgs_11", + "nixpkgs-mozilla": "nixpkgs-mozilla", "utils": "utils_4" }, "locked": { - "lastModified": 1741655438, - "narHash": "sha256-oUpa/82OF6YJJ2Aj52P0IQZGw0MH+bKGyacnRQycL+Q=", + "lastModified": 1741691220, + "narHash": "sha256-OSRyKWVqSdeciy1DGYh63fxs7SbppeGRu8/ui54sTtc=", "ref": "refs/heads/main", - "rev": "b00b5cac6d119a30fa60a1703d3e526985015477", - "revCount": 244, + "rev": "35896efa04bb50e2342946e33367245b1cb4460e", + "revCount": 246, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/ldap_backend" }, From 3f82622e97a5f53df7d781bf109c4a3beaea49ae Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Fri, 14 Mar 2025 04:09:42 +0000 Subject: [PATCH 027/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index b5364ce..86cca21 100644 --- a/flake.lock +++ b/flake.lock @@ -920,11 +920,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1741297347, - "narHash": "sha256-X+yD0wk7vHsT6MNL2yoTVqs7tv2x/FiY99CcXlGOoyY=", + "lastModified": 1741925000, + "narHash": "sha256-hq5jVJJw6Xf+nIKsWPfHk3TYH31d/t89p5Tvv8SGkpM=", "ref": "refs/heads/main", - "rev": "f307fcea43fe0d002c96921fb4b819c8e78cca84", - "revCount": 243, + "rev": "b44518c467b61650eab420d979f46166680c8a8a", + "revCount": 246, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From b3a40b9d0493248e448dab809e1d6dd1b5f7d2f0 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Fri, 14 Mar 2025 04:49:19 +0000 Subject: [PATCH 028/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 86cca21..2d6e9af 100644 --- a/flake.lock +++ b/flake.lock @@ -920,11 +920,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1741925000, - "narHash": "sha256-hq5jVJJw6Xf+nIKsWPfHk3TYH31d/t89p5Tvv8SGkpM=", + "lastModified": 1741927472, + "narHash": "sha256-OMnHKUpVk5oEij6q2WduoO0vJkmXXCDD6TGeF9vOLVA=", "ref": "refs/heads/main", - "rev": "b44518c467b61650eab420d979f46166680c8a8a", - "revCount": 246, + "rev": "a90724398683c245be2a5647fbeca78b2e7f5b5c", + "revCount": 247, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From bf10347dca6c56ca59947a9471323911176a9b62 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Fri, 14 Mar 2025 05:03:10 +0000 Subject: [PATCH 029/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 2d6e9af..ce99479 100644 --- a/flake.lock +++ b/flake.lock @@ -920,11 +920,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1741927472, - "narHash": "sha256-OMnHKUpVk5oEij6q2WduoO0vJkmXXCDD6TGeF9vOLVA=", + "lastModified": 1741928371, + "narHash": "sha256-IhZQ8XJsQ1hmf3+plWSYEqw7dFjcgbPUhRWkpsQOrOk=", "ref": "refs/heads/main", - "rev": "a90724398683c245be2a5647fbeca78b2e7f5b5c", - "revCount": 247, + "rev": "7f7e7ac598f4a9e03c5bd205f1507cd7a76394fe", + "revCount": 248, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 70263f4b1f1a645f0e0b5edd9aed04fc7a4157f6 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 21 Mar 2025 16:54:25 +0000 Subject: [PATCH 030/107] feat: setup the mail filter --- ITD/Firewall_Rules.csv | 3 ++- ITD/Server_Inventory.csv | 3 ++- applications/email.nix | 10 +++++++++- config/dns.nix | 6 ++++++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ITD/Firewall_Rules.csv b/ITD/Firewall_Rules.csv index c955339..76cd029 100644 --- a/ITD/Firewall_Rules.csv +++ b/ITD/Firewall_Rules.csv @@ -44,4 +44,5 @@ SKYNET_FIREWALL_00032,Remove,i24-06-04_017,Complete,All,-,193.1.99.90,SKYNET0001 SKYNET_FIREWALL_00033,Add,i24-06-04_017,Complete,All,-,193.1.99.91,SKYNET00017,8080,-,Websocket for admin panel on games management server ,Add,i24-07-15_112,Denied,193.1.99.75,-,-,-,22,-,Response from ITD - 'Our IT Security team have advised that port 22 and port 2222 are only to be allowed through the VPN and will not be opened to allow inbound ssh connections directly from the internet' SKYNET_FIREWALL_00034,Add,i25-01-26_075,Complete,All,-,193.1.99.91,SKYNET00017,-,23318-23325,Ports for Minecraft Bedrock on the main games server. -SKYNET_FIREWALL_00035,Add,i25-02-14_114,Complete,193.1.99.75,SKYNET00008,193.1.96.165,SKYNET00012,22,-,Allow our forgejo runner to access and deploy to teh external server \ No newline at end of file +SKYNET_FIREWALL_00035,Add,i25-02-14_114,Complete,193.1.99.75,SKYNET00008,193.1.96.165,SKYNET00012,22,-,Allow our forgejo runner to access and deploy to teh external server +SKYNET_FIREWALL_00036,Add,i25-03-11_125,Complete,All,-,193.1.99.86,SKYNET00027,25,-,Email Filter \ No newline at end of file diff --git a/ITD/Server_Inventory.csv b/ITD/Server_Inventory.csv index d9a63f5..c7a57f1 100644 --- a/ITD/Server_Inventory.csv +++ b/ITD/Server_Inventory.csv @@ -24,4 +24,5 @@ SKYNET00022,ultron,Active,193.1.99.084,Proxmox,VM Host SKYNET00023,optimus-test,Retired,193.1.99.085,Nixos,Testing flake for Pelecian SKYNET00024,optimus,Active,193.1.99.090,Nixos,Games server manager (replaced SKYNET00016) SKYNET00025,bumblebee,Active,193.1.99.091,Nixos,Game server - Minecraft (replaced SKYNET00017) -SKYNET00027,vision,Active,193.1.99.085,Raspbian,Proxmox Qurom server \ No newline at end of file +SKYNET00026,vision,Active,193.1.99.085,Raspbian,Proxmox Qurom server +SKYNET00027,mimi,Active,193.1.99.086,Proxmox-Mail-Gateway,Proxmox Mail Gateway \ No newline at end of file diff --git a/applications/email.nix b/applications/email.nix index 4d0c905..2129de2 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -288,8 +288,16 @@ in { # set up dns record for it services.skynet.dns.records = [ - # core record { + # This is the mail gateway, try to send all mail to it first + # Lower number = higher priority + record = "@"; + r_type = "MX"; + # the number is the priority in teh case of multiple mailservers + value = "5 mimi.${cfg.domain}."; + } + { + # this is the main email server record = "@"; r_type = "MX"; # the number is the priority in teh case of multiple mailservers diff --git a/config/dns.nix b/config/dns.nix index 9cd7484..636dede 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -32,6 +32,12 @@ value = "193.1.99.114"; server = true; } + { + record = "mimi"; + r_type = "A"; + value = "193.1.99.86"; + server = true; + } ] # non skynet domains ++ [ From 69ec3abb3b131cb03b7928ccb280acdde9d124a1 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 23 Mar 2025 00:06:29 +0000 Subject: [PATCH 031/107] feat: we now have a sso/oauth server ther we can use to connect services to Currently works with Proxmox (VE and MG) and Forgejo --- applications/sso.nix | 77 +++++++++++++++++++++++++++++++++++++++++ machines/kitt.nix | 3 ++ secrets/keycloak/pw.age | 20 +++++++++++ secrets/secrets.nix | 7 ++++ 4 files changed, 107 insertions(+) create mode 100644 applications/sso.nix create mode 100644 secrets/keycloak/pw.age diff --git a/applications/sso.nix b/applications/sso.nix new file mode 100644 index 0000000..3bae2c2 --- /dev/null +++ b/applications/sso.nix @@ -0,0 +1,77 @@ +{ + lib, + config, + ... +}: +with lib; let + name = "sso"; + cfg = config.services.skynet."${name}"; +in { + imports = [ + ]; + + options.services.skynet."${name}" = { + enable = mkEnableOption "Keycloak server"; + + datasource = { + name = mkOption { + type = types.str; + }; + + url = mkOption { + type = types.str; + }; + }; + }; + + config = mkIf cfg.enable { + services.skynet.dns.records = [ + { + record = "${name}"; + r_type = "CNAME"; + value = config.services.skynet.host.name; + } + ]; + + services.skynet.acme.domains = [ + "${name}.skynet.ie" + ]; + + age.secrets.keycloak_pw.file = ../secrets/keycloak/pw.age; + + services.nginx.virtualHosts = { + "${name}.skynet.ie" = { + forceSSL = true; + useACMEHost = "skynet"; + locations = { + "/" = { + proxyPass = "http://localhost:${toString config.services.keycloak.settings.http-port}/"; + }; + }; + }; + }; + + services.postgresql.enable = true; + + services.keycloak = { + enable = true; + + initialAdminPassword = "sharky_loves_sso"; + + database = { + type = "postgresql"; + createLocally = true; + + username = "keycloak"; + passwordFile = config.age.secrets.keycloak_pw.path; + }; + + settings = { + hostname = "${name}.skynet.ie"; + http-port = 38080; + proxy-headers = "xforwarded"; + http-enabled = true; + }; + }; + }; +} diff --git a/machines/kitt.nix b/machines/kitt.nix index 71a0fe0..93298ac 100644 --- a/machines/kitt.nix +++ b/machines/kitt.nix @@ -31,6 +31,7 @@ in { ../applications/discord.nix ../applications/bitwarden/vaultwarden.nix ../applications/bitwarden/bitwarden_sync.nix + ../applications/sso.nix ]; deployment = { @@ -54,5 +55,7 @@ in { # committee/admin services vaultwarden.enable = true; + + sso.enable = true; }; } diff --git a/secrets/keycloak/pw.age b/secrets/keycloak/pw.age new file mode 100644 index 0000000..7792aed --- /dev/null +++ b/secrets/keycloak/pw.age @@ -0,0 +1,20 @@ +age-encryption.org/v1 +-> ssh-ed25519 V1pwNA /0giXND9iXet45Qdm45LbVQlIN1JYDiIJ1EFpMn+QgM +qxCesmTuF6auI9upI0V9rJSiSfzENLLHXIMrDewjvf4 +-> ssh-ed25519 4PzZog iSvze8+tKCozFbiXcc8BGfQ0qrlVUHNEPc0E13505wY ++queuxWzkBHBR7q1pHhBahdSqgKYmpOZ2avC+S4u2tk +-> ssh-ed25519 dA0vRg MAQ9mfNn3wwB0hFaV/Wg6nxM1vafopAeJynREcbSvAA +VjD1Sy41PEy1TQ5Wc/R9gh1gN/T8y/bUAdItWRz64GQ +-> ssh-ed25519 5Nd93w RAh3fYyjUmldiUFkw59/JZDTgZ+jrVd31akiV1UgYGM +HvoJTTxM+sCkXIDv0+FtN4ACkTy7tqr/BNeTrR8Jumo +-> ssh-ed25519 q8eJgg c4+/61Jhm+/QyV0s3ikemMqhWBRb+ous4kl7Psx5/WU +GUqakK0Rrsgg48U9QkcpV20zvQAswk/anoACzORuxiU +-> ssh-ed25519 KVr8rw /mBl8ejPUBEwVsDVFcwWfW1i0tIG5JH/OWlRSrRk+TM +K3SJpjAm6VDtsBk6HyDdLgbImh4If5Od2qu+sL8Dj9Y +-> ssh-ed25519 fia1eQ khFHXNgPUQ39oTpd1lWycrMUin8Ii2pawwFY1vIhRSs +2XhIsPrtN+XOBlTR/sEaaG5XCLlsIroYspOaEz+cM2U +-> ssh-ed25519 IzAMqA u6W5klKqqGx22yCJx0yGgwPs3vs+iAeH5z36isWL8Co +Ij4ncciynno2m9ZKtAegFy5mjAGS86jM7NrCL73LROc +--- mINzTQYjXCu318AiJxgsF7az4LUGc9iVS7hcyfFNTQs +m.>i~8$pBѐzh:q 'S:Ld + QQLي{,;ѵ~ # \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index cad986a..9757a3f 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -99,6 +99,10 @@ let bitwarden = [ kitt ]; + + sso = [ + kitt + ]; in { # nix run github:ryantm/agenix -- -e secret1.age @@ -148,6 +152,9 @@ in { "bitwarden/secret.age".publicKeys = users ++ bitwarden; "bitwarden/details.age".publicKeys = users ++ bitwarden; + # Keycloak/sso + "keycloak/pw.age".publicKeys = users ++ sso; + # grafana "grafana/pw.age".publicKeys = users ++ grafana; } From 2ae2caaa94984b05cb3932112c2fab27db9e46a2 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 30 Mar 2025 19:10:41 +0100 Subject: [PATCH 032/107] feat: properly set up grafana Currently works with Proxmox (VE and MG) and Forgejo --- applications/grafana.nix | 2 ++ secrets/backup/restic.age | Bin 2870 -> 2870 bytes secrets/backup/restic_pw.age | 38 ++++++++++----------- secrets/bitwarden/details.age | Bin 1155 -> 1155 bytes secrets/bitwarden/id.age | 36 ++++++++++---------- secrets/bitwarden/secret.age | Bin 1012 -> 1012 bytes secrets/dns_certs.secret.age | Bin 2924 -> 2924 bytes secrets/dns_dnskeys.conf.age | 42 +++++++++++------------ secrets/email/details.age | 49 +++++++++++++------------- secrets/forgejo/runners/ssh.age | Bin 1491 -> 1491 bytes secrets/forgejo/runners/token1.age | Bin 1138 -> 1138 bytes secrets/forgejo/runners/token2.age | Bin 1138 -> 1138 bytes secrets/gitlab/db_pw.age | Bin 1111 -> 1111 bytes secrets/gitlab/ldap_pw.age | 37 ++++++++++---------- secrets/gitlab/pw.age | Bin 1111 -> 1111 bytes secrets/gitlab/runners/runner01.age | Bin 1065 -> 1175 bytes secrets/gitlab/runners/runner02.age | Bin 1065 -> 1175 bytes secrets/gitlab/secrets_db.age | 38 ++++++++++----------- secrets/gitlab/secrets_jws.age | Bin 2660 -> 2660 bytes secrets/gitlab/secrets_otp.age | Bin 1110 -> 1110 bytes secrets/gitlab/secrets_secret.age | Bin 1110 -> 1110 bytes secrets/grafana/pw.age | 36 ++++++++++---------- secrets/keycloak/pw.age | Bin 1024 -> 1024 bytes secrets/ldap/details.age | Bin 1637 -> 1637 bytes secrets/ldap/pw.age | 51 ++++++++++++++-------------- secrets/nextcloud/pw.age | Bin 1024 -> 1024 bytes secrets/secrets.nix | 2 +- secrets/stream_ulfm.age | Bin 3194 -> 3194 bytes secrets/wolves/details.age | Bin 1943 -> 1943 bytes 29 files changed, 167 insertions(+), 164 deletions(-) diff --git a/applications/grafana.nix b/applications/grafana.nix index 3bce51b..953b02e 100644 --- a/applications/grafana.nix +++ b/applications/grafana.nix @@ -49,6 +49,8 @@ in { domain = "${name}.skynet.ie"; port = port; + settings.server.root_url = "https://${name}.skynet.ie"; + settings.security.admin_password = "$__file{${config.age.secrets.grafana_pw.path}}"; provision = { diff --git a/secrets/backup/restic.age b/secrets/backup/restic.age index 1910186cc84b9ad68af9ec481b3e011288dceaf7..8f7c0425ea8ab0fe4651961ea1c328003fd1f320 100644 GIT binary patch literal 2870 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 diff --git a/secrets/backup/restic_pw.age b/secrets/backup/restic_pw.age index ea0bc3b..941d6a4 100644 --- a/secrets/backup/restic_pw.age +++ b/secrets/backup/restic_pw.age @@ -1,20 +1,20 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA mGy7a3SPHMxFaJ5S68jaRkPk16Ahxqp7C2YGnK6A4nM -TrEf7fz6yY7G2HXNxhnM4v7QkVrR5D6vdh+eUVbWbdQ --> ssh-ed25519 4PzZog 5ixIvICVbbk2z8gqvodMAhCevBWdnfmpskWupnpMm04 -r33h6oeu1jQQGs3mP15xtbRq50FGpKwtbbqWbSTQ1jE --> ssh-ed25519 dA0vRg gUxwHHDBhxpYMxBE+UfTYJ4I8nY7cEdWG1XBSLLWtlY -pNawroXlES4EyNZSUUiEPNy+WNdG9AnHnUl+7qLB5Os --> ssh-ed25519 5Nd93w AchMesYdEdLHtphyfCumqrdCRFABzNOEf7KfFgQWFAk -Xnier5jnPDl9n8F5r/R4CjBoEvmwAJRLQWnoWoAudec --> ssh-ed25519 q8eJgg AgmUpmYT5z1qAFZ+uUY5a7huZ8Bhifs1ZuDBlg7ZJxU -kgaKF9t8cEKBc715dNocxA3o+2dwpK8erRo42NzeP9A --> ssh-ed25519 KVr8rw AafFkG0axLsqGVs/k0DrzLFsKk4uXtqRbJIFhuAmj18 -shiQFq5ZznBovnNXWfTNvSVX/O1X47hK6g13P8r6xN4 --> ssh-ed25519 fia1eQ AKbaMyAtdDHSpP5taXQQjaunzvO6yZuCOUjgV2+4iDc -yDFZ54QNklvVHUD1AkiaQ0sntqiRxkMGZw9yos/IvcI --> ssh-ed25519 3pl/Kw KD86EfxdUwpfFW7wqf283Wmdw8o/qnVzXxTCrtNPsWI -L1a9WXktp4a9s1GxF6O7VV14ZPQOp/VqwS286Dqa3Tk ---- +jytGaOhLk0unuAlkbbtAFNde8Z+tKJ/3l3Y3tBgcFQ -VV7P =O]bZjpQKaXINl_v -Hsh3~FW/ ^a\ #/ڇi[fbX \ No newline at end of file +-> ssh-ed25519 V1pwNA mN/1o9VKKc+kBc0s2DEmjHJn6AUbCQUoaCsvswNHzUM +SlqlUx/Ok6lrc71g7uJYG4/Y+DG9nnumw0GsHtFH9Ao +-> ssh-ed25519 4PzZog Hm/dzRXkAtX8iopSdsrRw0rIAKtagbRtS9zGnFZdjAk +dIhBGvUOUd7SgqADywQnnv/lggussXa+AxOdxI/gp4E +-> ssh-ed25519 dA0vRg mP3xepL4DnV1V0sYrS8n5a9XFaY3HlYn88IjukBW2C4 +KpUv1UGZdzx3kHH8LlkqCIgGK9DAOZSyN+bLfaPABcU +-> ssh-ed25519 5Nd93w E8tGoDN/aQoe9gmMkIWxB7vsgQ5fJ8WzjO6+NefmcXM +HY65eZHHm3GovuZoVgOMh8kveA1aaxyYBvXDMuw5Ry4 +-> ssh-ed25519 q8eJgg j86zF1fq/TSyxl0CTlvnJw0MJVVtG03oqGDumyovogI +gNZY0eSlLIstaHlbY/6n44/BKaQITXqD8qNOJGotplI +-> ssh-ed25519 KVr8rw 7T8vLuXcc0jrtvQTu/FU3ZZC963YkAizU5Q79OQEvxg +R9YC1AZsrJa6PZ0Vzum9TKCwFPd5EWJ4McJqtNgQQ34 +-> ssh-ed25519 fia1eQ bzqIMpD3LmkKUPRZ8HibiqJDZfR2lIcMCICputpX2w0 +2TMqO/yxAMPB4b13/r6jBytD5lhbhauxTrmCx95w/4s +-> ssh-ed25519 3pl/Kw 9qEhAIqJFP6XrMsT5ju8XQeG5dNG/U0/wTUiPYT7xHU +gT+zRjaAhAK/BUOZXAWNUq90F1I9T/y6qZuGRnbHroQ +--- QGGO/WedFvcHW4JxdpMHP1PbfaB1ITP4KVb5vWF3Kzc +Y@/ܻKhA@0K +.uq_9`, W%Tn`Cʯ÷1n3?ŹєǍV] \ No newline at end of file diff --git a/secrets/bitwarden/details.age b/secrets/bitwarden/details.age index 7c53a8d075d8c11ddcd27be00e352781b4e3e5e7..4777128a8e12ba8668dd82eff7893033a22bc17a 100644 GIT binary patch delta 1069 zcmZqXZ04MxQ(t0QoSWxf;qB(AUvA-A8JJX@T=sp-YEtZ$rk|B)nCD#SY>}Q? z5Rze<;}KHMW#ZzLWl$Voo|jz~>Kf&o8tm>HSQ=;%k*1xS7@litQsHB69_;9D5Lg&E z@uPTndX{TpUQ$q&ucxPHVuhP!aY&+JuwkWPLAF zSU`cNWr22viA7|Nk#}CWUqHHNdA66Yc~N?mYgTb)RGMd~pJ)E$ct-K?$izg8tVqvH zlk~LUAnnS+;vy$g?aXB3qRPMmw-mp~^a$6elI*Nv|B!qx*W|)-k5bcusBrVdT>ZSl zpp3lG0>>iH$XvtZ48Ozz|HP0gKYi_dpUlX~XBoxo(|nThT}msnD$4`I{N23G44f-M z%Oiq9!xD=MeY6Yx-3%f<%>znyP!O>*wHXKJ0v36Ej7}x$}v1J%EQ8> zI6ula-QU?T65YDA%tXV~Km|Xqj0zK%6qD4{Y%t$WNQp;2)&-`MSH2w5~QkTGBZ?i}fgCdgxbF<{KqQXdXzYwo9 zY)^FSJgXdi3mp|qyeiC0k}Lf(i#;;E{3AmQLz6>1y$o|Rsxm8$JS=>@jl8QIbApP~ za*Mf~l1+-V1O4h<{9RLna&t=!GRj@k@-s8sErNqG9W(t>N-7-7!_C}`(kj!rbaizV z3L zndG2(m5cR1d;In3>v^x+e=~S^INd|zy;>1dW6rs*XThe|3td*O-}mwAeg5^87dh{h ze2)3`XsV&FLc7baQ-PcL1>K!B=WeXK@XmKp-Vd?W%)B?;9z@){VE?+kJo-lMytyaN zYQ%c`B=VeI-p3UDKzHk7l??q^(z65;9`j^vHvO05asPCmfJ%H;{Nw*Nzl)gIRuq|= HuN4FUALN1I delta 1069 zcmZqXZ04MxQ=e)Oo}c0pZeVWilwMMvogA8(wKq7L*(s z%9ZWx;v10anqQt3P-zxsW@uiVW|EX>7@6rEVya&dWFF~iVxXO9uI*i%%%y9mP+Xj$ zo0?)|YHDbyU=mOjm7lJVpJ-@q9BH7RU6y50rC(B&?Plo}92$}5?jIcCoNpeHYZ|Uy zk>ZygXzA?By(nF?PzRS8Dd)Kn_q5doS1K96zG#Z z@uPUSVPS-MO1h_inW<4=wr74wK|qy%vX@Drx1*U$Wo}w=Zh2IOeqecMad0`8i)VIH zpi7Z^WT0C{igQ4oc|@qcb3vJbe^G!%flF3Wx3-cmp z?{d$w%FLjuoMMB@Ot-)w{fbmq59eG910RFQXBoxo!?pdqBmE0J3WxOz0fo(BeB9KLOaJ%+sQaG%f!pnRXf8p zyDYLI+}kie9o@RL%tXV~Km~VG=kfyW5*PhU?c~tXVDIn@gW^2TqJVrSbAL0#^rYbA z`tnGNaQzIgN)s+0KgaZx5}*7W@1P=6W5+~`kfhSe9Ovwy^q_KQKhLPBvIwu7vaHaG zC=+z+JgXdi3mp}b^Ham!N|H>SUG+^PO*4wZwGD$J-E;j76T`CIg3}^>4I|AW12gme zbMm<|Gg5%zd0)jSQS!EM0?=GJ?u8%)A_pLh@a?baizV zJRFM({8Mt0b4`u>!adT;jh##bOtihq(z4Txb8||wONu-lBl9dmf)g#cPBd>S;oms% z)Rwu8XEv3{cwRZZn$x(x*+}e+^91SNtud!?4ATd7o-QMG^i2hFS_Pm1=uIc$`i*Esdbk*hVk-UaE_GftQiX>+My zt8U?exzQY()gyky diff --git a/secrets/bitwarden/id.age b/secrets/bitwarden/id.age index 7c2ae23..4ea38d7 100644 --- a/secrets/bitwarden/id.age +++ b/secrets/bitwarden/id.age @@ -1,19 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA +Bzh++C1+jxdz1VwwhxPpO3XWn8fy7bsP2wX4mlQ63A -1GZxY76fwUOo/t/XeoCOEuxxq+oiU8+GDaasH7VTOkA --> ssh-ed25519 4PzZog lkqPlBejVuYcBQwAZX96296VjJqyz3Q7J7O7OzfSDmw -x+bGIiw4SYhEePIkF5PLK6KK7EJ8Iay1oQIOJ18DtQY --> ssh-ed25519 dA0vRg o0tqstSEhdxxdu4Bu8T/r8al3XJpIHvXp7xe8YNbJgo -m1OKX0L8Nn6ZrXI0Sk61fe8JIRbh+os7p0wzCMtdi6Y --> ssh-ed25519 5Nd93w pYmPUfDB3HfJZDPgNh4Vmdu3UlTimrX4+EtUzSONyw4 -C/URv/SZEtUlI2SBPNTfni4oI+bsYZ/Wq3xilcS6mMc --> ssh-ed25519 q8eJgg k5Ml805g9vQ5Wv3hozSCAq8EGzvczTfpssrOeBlB+GE -IxRgNIg7Xi1RN9MthSqjsHoaLpsFWoUVd9f+ak9Qm08 --> ssh-ed25519 KVr8rw 5YvUQVmarpS4FgsFI8EFLz8tucmvs3V3Q8I0hT9q1i8 -Lifm2EUWhv5hDU9mwkOu4fH8zyjEtGXW1qVBbC4dfvs --> ssh-ed25519 fia1eQ sSzTT/AeSH5y4vyKt1Vl0bnkT11ZXINQi/pGU+M3oh0 -Qm0ktboSsC0/+HBCIsOu2Oa+EAdT/DlStNLRpC+EOtw --> ssh-ed25519 IzAMqA DhHry81R6JO3xWujL4l3uOmtqvdmk40srcWuXCU03kg -L4AWjbf1+bNXSMfBpC6DTKU1hvql+1mIRemeHZCFXos ---- Jlkn7bKGiezveI2e56iV/3B08/z/JxsJxgyvgZ6WhN0 -|s X#?WٺW(@L [^tnhGc\z^>^D{*.! b \ No newline at end of file +-> ssh-ed25519 V1pwNA H7YH2bTxZIlSQR6h9LTj/rdgIH1FzrT3zGujEGWa/T0 +EB/hy708s62jz9yhqVMp/iouRC3Hf/GahvtZzgTK6Uk +-> ssh-ed25519 4PzZog 0UlgzFAlGE4dOOHlGaI9DNBu2UaNTGOzjICpA218m1E +guZIR8Czh3zt4W4mKkHzp0VzhdK2nzM1hDB94t4AyFY +-> ssh-ed25519 dA0vRg 7J2jo8Y7mlp91/N41e+cuv4Y46Ui+DKnNhfeXd2dsj8 +HqAFiScEAKMK4z4bfx+7PQQJQwm80GxjzjBghplVQtg +-> ssh-ed25519 5Nd93w VIsfbZTy3Ima3RoXrVDmzm/bBlPRT7vgzwKLkQ+7WCE +ZTX0Gryg/XoQ7Pu0jmBb0MBKv0ee6GUFuOj27SThHIo +-> ssh-ed25519 q8eJgg FOcmChMzV93MYDuFEraXcksxUi2YSxM0t1VXXmZOVXk +vBdFZBUquAmb1GQV+Gs8wLzzK0IS2yV/o9cnYiMGBPs +-> ssh-ed25519 KVr8rw qC6uMcLvYz4gIK4Ajrfqzr1PBC4Iqgw6elBPRztTUzM +ww7UnTYn+ZwUwTg2xpNIp9cmPCxRztn+NWGzVfSgCMs +-> ssh-ed25519 fia1eQ o3z/yAM9iwIYMJnmp/uJ/ul7nNp447VgumnKzSQyvig +dUXr5Za7VZzHJSmMwUw76TptIRHdtBRdHv4IRKfzZog +-> ssh-ed25519 IzAMqA otPdEEaDoxx4CiZkn+Ho+Vp+l+BPC2a5vkSv1DCg4Bw +FCFjzX4tueayqW2vhzowZfntufX8uR5ViGFH78r82J4 +--- Tnv8fDlZG/DndtKdjbuxPnw6d36W0lZ0uetXa1VcaOs +5m P_\@%ǖ2ƺMCyz*=QM>X3/1 4A5(c4gf,k \ No newline at end of file diff --git a/secrets/bitwarden/secret.age b/secrets/bitwarden/secret.age index fde27b6aa93e4768b604aab66b9ba4953a30eb32..f48af48ef1bda0cb2d10b69f4678b2d88de6df4c 100644 GIT binary patch delta 925 zcmeyu{)K&lPJOCVs9|PFrb%W+azMD5Yo%XhK}uk5d9F!LPPkz}xPfDEdPZKkzQ0>| zI#)@gS$0vOaZzDTazLeLPH>8aesE#2pP#3Xv$kd{;7#><<7oboiS%JcLnh)VM>4KyyX z^!N8kGY{8KN-FmD_AIGPwM;Y!cXQ0QUiT`Pj3T%Z6nuEeed+LD8Hn@iWD;w z$569^N`tBbPju_jG7}9`0~NB2Q?&hx(@KrPd?LL-|Hb{7lQj0`s|i{0;Se1AV=cGXjgXBeT52+`_!P%_?(zt4a-v${ZalLaItFN{b@0 zBGS>V^Q?08Ep${UaCddpx5x|2$xQPJatSjJ^NTEWbTe?t%{DYDk8%z(bf zFv(5#anJRN@C)$>EYx<(GY&O(it_SEGA?pAaEVMd@ee36$}lX+3XSyS%G`K&%f_>6 z{(k~iEsDErNJ+lGr&+PKVY!ojuxW|O z#E;_PrKQ2anU3jIt^w(38QNimu10}rPTCe}*O+a#?B`GWfcZohWTzz z`YA5Kfk6eyt|1Xgrk)j%!G*!@=J}o$kp`Lixs^_4o{3(CC85ca;~B-nqoN#*Dsy~| zbDc~ovMPM5d~%B-{YtaKLz1(?iqpM=syrjZigN>k3nM(aj1AHaO)4|A3;a!T^MlIr zQY<4XQVsP311oY}jWUd?JOV6p3-c^eLVc1apJf!U&&du5tuoaw%QG~{%gr`0c1(3N z4A(bHD=;oet1L?KDb&tR&kr(n&Z;!vO7kemiYm#9bT_mp56{Rbi;6T(&NFtasPM{+ zG%>6SOgA*kDJe~HDowROj{)znB8#GO1y>{g%q-W;Y|D~>G>?@}M+=gDj7+mb9kaPgOAaV|4;Hw!g%$uo7$EKLqHEYI;a(bg|7PpyhD%L?)2($&>f zNb_+__SQ~wO|&pJc26mEEK73HF7_-k3d;=k2uv(73=d2X$j{HVG;vJll3UZg=HS{5 z70+iq^j!aHf2P*|LlLKHu1L)9);c6Q&#s~VrQ$zU@2L~r=ZiEizG?n0|Lg-z*U*KX Mv(0aZPUx5m0C9Icv;Y7A diff --git a/secrets/dns_certs.secret.age b/secrets/dns_certs.secret.age index f146486594541c9e73bc894bc4801296ec2c6eed..2f4966b5c71bb8a5e9d37cb94e88694436c538c5 100644 GIT binary patch literal 2924 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 U3+6q#)VeW5NbCOOH48og0JYP|rT_o{ literal 2924 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 V2&%B<)KIR?Tr~GV ssh-ed25519 V1pwNA UBWTUleT3gH3VTd/ahMfx1iSc1JTTlZWKxD4Sx61Dmk -rGgE6UbDrVFRBbCfw2+o49aIlk4qOHDNYD5nQnt97vU --> ssh-ed25519 4PzZog OGYMrxkoi+q8ysF/6+HYm+RQshv6jhZyjqQr+d5/vlk -1PY3xrn9dHVnXOOlEukTwnF0S5KL6AsDRXh5MvWioyo --> ssh-ed25519 dA0vRg eVrtU8/e3XSCjOHFeujDNIZHPWDq3qcot/+RXmBwYyk -mOFaEqWEnYtKxlilozF2QRyKPsOP3HvNWnQ3KLRON9Q --> ssh-ed25519 5Nd93w WXvBheSNZ8CJOtyxeK6GBLRgt3n1hgYGGnksp4pUhBM -0mr6EjSJnnJezPk1nXIEpaIMmn30tAFJj7pmpS7vHzc --> ssh-ed25519 q8eJgg SLkAt5hvW2niDBIqeKjcYZvDR9CkJzu4wf1y+0Fizzo -ZNm7qSf+Bl981GJuZPPjRL1HcCJbZ58eOUQe+jFE7K0 --> ssh-ed25519 KVr8rw xfJAoIGIRNVyRsPxjlARAFXm3jDnYxBZws0/8mkqr2E -w//2SGsPl3BjEgGIWAsomH8jGwnOKCpn0SJsbb4y2EU --> ssh-ed25519 fia1eQ MjtOJN21srAeob/eGpKQON1FGebBqvZo1bKfQFz2bhY -eSRZ3DTQ/HfueI4k56nkAmUdy7MARgcNYgPGD5amCTM --> ssh-ed25519 NtlN/A n5uN0giDnRaRrfa0jCpqkDnzx1x6hQipumVP/dM9Sw0 -J5Z3ETAYMQbugOUsak+k0suWd3SInz2kfRDrJhP5ObA --> ssh-ed25519 v2Y09A KxmOke5LEOx90sSm3W5gdNHTxk9Smrwya36g8rxFyhw -2FUiiEe5v1CUG/Gkyu1Gw0/tmo64wCIq/vsCjevL3l8 ---- eFkoeakUQHfc0nofk2Sm/k0ujxlkKkahdm/MmMqPHrg -Š -a -5'?c0 5Sh h mȍfZG+>6uϿrzYЍޯѦJ|a>7iYa.P&dKZS̩/Jr;׾io9hNæ \ No newline at end of file +-> ssh-ed25519 V1pwNA bfDBtLa7MSSEgZq6q64mkMwGcra6xtlATR/S9dFN/lI +4un/JaBnt4N3ngrxiTpKl401sFRTJ8OxzSPa1iSwCyA +-> ssh-ed25519 4PzZog sWxeGJic+1kkrMf9DNNAQ/EyxXhXy3QT0t7okQSJiQw +tOEBzods/724JTETOyzmY4DHbMssaQjB3rkLKlG8I9g +-> ssh-ed25519 dA0vRg 87wl9rQyDUMz3Saacc8YdDUqBSMgQEGsDW017ADdwkU +GLPkwXaS1MAi3L9T9NRsRabQ3N+4b0T2q2K7ezGQfG4 +-> ssh-ed25519 5Nd93w +O5uYPYYHF1ocJzVLw7sM6BeetboqoOFsI5B1l5lYi0 +qgq9suCE/JxRI/1vDqE0DtqTnJ1sNLfTsYheTZPimoU +-> ssh-ed25519 q8eJgg ymbogv1TZLM/yTyyVx6IF6EoWC9eUPYkwfP0mjmmCGg +F5haIRqiWoeJ9ZNk2XriYHJTiUtLq04r9o0c5uS2nWw +-> ssh-ed25519 KVr8rw XcHHH2VwKPrb7Xk3G4nxBfVzqZqQItTRXlm3j15O1zY +Oz4R27q7EeVKoCq5CAui9zQxlr9ESaAC5XkKun2kmKk +-> ssh-ed25519 fia1eQ xC9LxTGN4aLjBwea1lt/J1m1eSJFV/SJtNlLcd/mTX0 +JwvVaXTDNslhhsXyAskV4zpJz6g0NhLx7DosrD/b7yM +-> ssh-ed25519 NtlN/A akFElU7sdSYVTmNrji5lAOt6cVzTHprTZaJT+w22HgY +1Xe7+C8SyYhVnoB5FsuSY8mXkpyLpS6FmqVXnceWuMI +-> ssh-ed25519 v2Y09A +ROUvtp1wJt2HmtsB465uVPNxHPuEd254znvk+7VRmA +P8+NmCIY3nGHIBoAVPW/CknO325q5f4lIaNhUUEh0TE +--- LfSoY4IcP9WX5VHX4ECx8E29AMKQzLI5lhCK0Qgy+kU +3x99LF'E4R۶8ZR%TbX5ጢ1==}l8LlYLWf3;#/4cZoS~[+V:2]mɍ?µND[oќ] \ No newline at end of file diff --git a/secrets/email/details.age b/secrets/email/details.age index d8c9aa5..aee60aa 100644 --- a/secrets/email/details.age +++ b/secrets/email/details.age @@ -1,25 +1,26 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA rR7/KSP2skc5HZDN98g30IIXuNDJsghQWfyVF57glW0 -oSpYnVqLObrE/MQNHonzOmpGk/BcDyMxwPPQauUB8Zo --> ssh-ed25519 4PzZog bUKm5Fqx40JQ/8BdJvP15xQvIjwTAxuAqsoPIAyRDi0 -xGvp4hTdaiqD7cxjJTjmJHgehY8VCOVqvvXNIQoGrRU --> ssh-ed25519 dA0vRg Ty2EEwt35A8ZigOkVmYlLgXbMePI3WALtM1McsFtQnQ -ygu01cCNYlaW9e0APNrDGPjfJE1KkNq1nqi5d6fwqm8 --> ssh-ed25519 5Nd93w UwOXbO00n1/2pxpz98BZ7yIaEr1PXEvOg7F3Nl80yTY -+E2VbVQXngXUHUQlc2P6ebU0/anioRu/EZgpdf/N8/Q --> ssh-ed25519 q8eJgg 82IpLMlE/9Wp4fD8PHIiKsff9jJYJtoPF58xCnb6GAU -Ip27egoy6jMgvvTRg6q5NXeTlv9EFhK9PM8rCFu8LhU --> ssh-ed25519 KVr8rw xEE59aHcuIIB/5pbH3bZuZQ7W2CDUCoyT6EmdOWiZ2s -2uaA7Nx8DNbmGvY/ns/DRHZ1zTZ+JifkR4eVtSzCRd8 --> ssh-ed25519 fia1eQ /YtGDHVjZTzDO7baOphkGvY0zCgElNT9UMpMhhjFCEw -03+ungOpBCqgTj/kyH1hz1LWTHSlkZ6Qb0c4i9bwOZ0 --> ssh-ed25519 IzAMqA kSa3Kbz9SyIe1pXTBi39RxVMi6QQV0rjAPgdbEmmJRA -SO7M5B6LR1aZ8r7mFjFAF+Zl1tlsq3j/3/BVkSPWFcE --> ssh-ed25519 uZzB3g 1WjjfJ50NZO2C7qKp4WOtDHEUlkF0CFmiehMsY8/6Wk -TP6FwDJp0nKd+FaB0tnZa9XoD8tQponT8wK2xZ/k/A4 --> ssh-ed25519 Hb0ipQ vRwS9w7tO0yryHoip+sqbsD67lqXLD+6hJDNi9YClAU -NiIy//77gNuQ9UJgvt1UPqD99QJzfbh4WFld7Ln0GtE --> ssh-ed25519 IzAMqA J5spaIE4OAKJsvd1hOy3M2cCbmAG0/9l0dsnKlZfxi4 -RT95kFe4vKr0HQVz+6Gfm7pat7HvSahle2zMhEaQ8DM ---- ag6/92VREDBr8oQUKcFbj25qK4gcMdHa+ej3hf+igbc -r:f)s;˲fI[g<'3rrkיB+cW|~7ϵU} ECq!j71VS4G8i9:Hl9VDmnvS \ No newline at end of file +-> ssh-ed25519 V1pwNA P8uCL9OgS5BrRWrGEFOSqvO4KsGc3Y3q02OL4sFBQCg +XuuBTNDWEkcDzcO/aFgh7d3XhRmj/8maHx2U6l4KOgc +-> ssh-ed25519 4PzZog 20A9EEcTrw/ZJjkvawiiUqHmMaNmwuP72VErLL8Z3B8 +w2Pl4/J0+MI07Blk3rRLAULbxMbFNLQpZkdJPhnoTK8 +-> ssh-ed25519 dA0vRg jn2VA10+qrRAktjhSARaE+MAS5HsHsoIZfc1/ao/mV8 +3ahsWtZ8/Bb3tpQnLSyEPFHeW7dsX9uEaLZbJ200u7E +-> ssh-ed25519 5Nd93w WKXWwcQBExcz6niKqBYT3JcL8EHfY2VeYfnTIEtEfGs +gzJOdp1j4QX3bWDzJgBig4/vDxlRRQl+jsGmcp95drE +-> ssh-ed25519 q8eJgg I1J3jOc15TsBijQW8/DZbRETY+233V81vPLKfGI0ji0 +SLtoYZ+8T72c+FWAi8dz57VJ8wweJY737AKPF0PQEtE +-> ssh-ed25519 KVr8rw CQZs4smVwaFAaFbLeyTFi/IaJyle199te4X8Zq0AfjA +/74zAyuwEmB1KcGBZK4QGgwShhqxOcEQ5wlpmtAT7Xw +-> ssh-ed25519 fia1eQ CkkfDdt9iAaUxUZt+aD+VDMPUcMegomtFiR6CCux/UY +WQcE9ck0HuSXYCWqsy6NOXAHOlE4VIRUkgz/i+7AVQE +-> ssh-ed25519 IzAMqA 2pbs+DJzOw4rgM80o0lUFzIgdMN/X0/7wrUh/OAxykA +291gUsUfOEEsf9o/qVoVI3s3gHmPK400NCEmpxNsefw +-> ssh-ed25519 uZzB3g YP3htz8c1QJzFyAyGopjelQCKPyTx0SOOTVEL/uTK1I +iupAfrSbl5ybwi9Le655pU3Kw+KKndFZI9M+AlSrBWk +-> ssh-ed25519 Hb0ipQ odISOFTymnTj8TnenWHMHeU0Qh4OSGYFy6vJUieehhE +G+Jje+2S+l9bSnKKrwGV5V2xLczDDPFXlZ8MsrL6jHs +-> ssh-ed25519 IzAMqA HIG1qsEisRUws33TxC8yGSrITlwDxuL/RIL6lkdjwUk +IWMnSXxQzv8cAQKNmiY/+hRb86aAuFloQk9WFFcCSWY +--- UK7VzqqXFlN+IVB2hl81+7o1d1NjbFNY7tYRbTvnKmo +(myHC|B,ì# kWsI{KHf⡒4F,zXv +W1!*{B)ReGK=@Q>BǜeL6D( GN $=A_Y!0tGqwK1n0atmc%@53vU6ZbfLl>SxV}kofq#K(sIjkpZe)R* zhi_VVvQMxHm%Cd^hP%I+v9U=+Nq&^RSBPgwl|huROHf&`S&Bh;rmMF_WKuw3foDMZ z#E;_PPX1=@W>GoWu7S=z?%|dG;qEzJCQeDF&ORP)nZbS@q53IRWhRFCzIlOMB>`?u zMK0xrA#Tnl-sxFp9ucJ>-Y!*M>4~m}ei=df75c@=`H@x5>AohD;~B-nbG@s)B7-AM za>`93yxrVG3*217BO;7V%Je-wBHeP5%{)x}b4tq0!h_4X5`D`8Gm46`OMQGi+}%Ts zU9x?hgL56tP24SAi;azZ%2HB{oh*wTos3K-pJf!U*G~5>OLDIY@=VT*vMARNNXaZI z4hYOo$+I*LNX^sFu`KZP^ENcebW1PhvM4DG57&}$9LtpOO6?NU5W`@jh-Bl^5HtOtbiaTq_h66w zD$DY$@N5gqP;~3kG7}9`0~NfI3$=>^v@896O7%mFEP~BboxKgSDwEuNa`RkrjH&{h z>(k4P@-s~;GCa9_TuLG;!pigg!izIgd?F3aybbdFOUs;0Q$36d(vnNv&CCfm@id7lboC0-cPmWH_IJ)K5AilmHpug} zH1_232@DF2@^-Fw@eT?IFiFZO&I)&Nt_U~CG4yfqEH8Bl4=ykA%Sey1Ow4gax2`m* z%E>rg!6d9QCDp(s+{rsXG1Dd3*{q~6)Y9L=*R3Sb&(XEWD=;ZD&o$W8!mZMm%Oxr^ z)g{ZUBG<@0!z|4&B(mJKAiFHAsNOs)ry!&-si?%c%q7t~IJej}kV{urSHUCHB0n*> zDBR6IvfMZ_%q%CoFg!W1yu>*>LOa{TJfomE-!RF<#Lzd`gv*}I@}K>JFF8*4%-3?B z?yfssSNu41iDr319k0NYbXmn?M`T3BRntDatmgRp^Jb)9-g9m{p`0ieW~GDmOM)ku zu6j7FM#f{eP~g_n6Yd>g)R=A2erSpK5x!Q5yB#~^I{P*)Ixn#1Z|zLAiVrH!UsWbb z?AibI>dx;~B-n&8iHGs~lam z%REc93(Lxbf{I+DJS%)HgCi^gQ$sz1o$^Z!{e3M`oLpSF94$)IjeQbBlfuFRf~(A3 zwaWudojnrMQv59pGK}4gjSBoTy#14$G6F0npJf!U4>d82a4&aBH8pUwC=Av&^(>F{ zHA=F`3~|jcvv4W&vq;^19a=sG7}9`0~PZ9Q*v^={4Jf03(}IZ0*l=v3@UStD=JI8!}NnQ5}iUU z>Vuq8LxTfc0zrgA=0cO)GJNfGSS30FDTE)I8hSB&Wn9Kf=R;D=0F! zSUWMt(9O)-Jj9?purSiEI5nrLq~6EesnE#Fy)@m;C(zW}%fzk1l}lGwS0T$i#iF3p zF+43h+at@kFvT~$GEqN2&B8D(SKrjq(y%Dgzof)WyTBy1oaBKXFTQ|>K=2xs{;y%qCo|1uS#Fdbnc;tGPtR%n zOp~^?o{w?5%)8;Jv({;kzkJi@N9>b%_rmT}Sp9syQ16jo}Hq$0YA1sNDl2{OPxBONX zgWT0%hohxM5uUkOEKy%sY+ScUTTj_KPuEg@S4WFoq@diMW2?GETf&l!&9v+tEiY9i zNgohu+cvw*Qd@WCluDoG^einc2ARkHId(R>tAF(v9{c2G{KfJ4gNXU6+~>UZ&hKEH zuDN}si0A6|yl#tF(*8fE#~<^<$|+&W gpAUu2B@1ekAG$JoO+H;P=S4iz>% diff --git a/secrets/forgejo/runners/token1.age b/secrets/forgejo/runners/token1.age index 50ad61e1019d108e153f0a30a0a6bd6fa460a806..bf7d1d52639c29aecf771ce66bfe70974b7a75d2 100644 GIT binary patch literal 1138 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5zhS@C?*8 zC@m{2b#e+djq(dj%ghYTF9_7n%umU82@Y^64)=3(cJwRAPUbRq49Yc1E_Msi&xwpo zPR=$qG)m9YE_6%HHA@c8^vEE#0`ZC?hE<#F49@FvBa#BPz?yIm^=DsL5kt_lz*FD9#NG4bRICiA?qJE%tFVFfptsu5$Cs4fZS5Pbp5R zEH*9naZTsScF)jGba69qO?ECW3P~|e_3$k7NG>pos?yFgG&J!mOV!SFv`q2xb1O%; z%{#2fqNrRUA}2Y|(aY1=Ak)j&!!RP#$i>yyFVrjCDX}oIG|w$CG_)|wJJiBGKew1m zzsk)$+b_s8Slc4mDLFSUDAR{P!(dH8ReUm=5E3jRb1hn78$N@RA`oym#ghr8tmv7;Nf4I zUu5iF;pOLEQsrWq;}l}#l9SA(tE;P!q-|*)kgV;LVU$yz9cbjAk(1_LQV?Qbnp0Ko zl$7gN5m{*-Qjr~4mgvZ}I?3Qp;&RcB>R&aRWOS?9n|-*%ZyVcW3UwSgEiF1{d-3A+ yU%u@R^@+W@w5#;;>nqt8gj)FBg$3Pya+EaB-SJv{;skfm@ZA>7qKsRn6#xJb*L4#B literal 1138 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5!v5N-8eP z$TBuAu1YN|$urMQ4=we{t;#9Sb~nliD$Ub2H8eIX^eM>-b>;H5a1A!IOw$fDN;kDI zG4S?F2{5xX^)pGzEb?~=bn++*Dou4uu1pLHaYeVyB%mrPKV8AY!=x%Z%sV49+n~ZM zBE2Hr-^iuZ!^y3*z~3!1#K6?l+$}AwFt4mA%#q8(E7-&@C@s*`*ef`>!oxp3JIgXp z-`6WU(Z|f(Ff!T9Lf_r5vNFj#JR9A%6i0)ypmc=-=ZqBRDg#5aynt*|e|L|_3 z63gUr4-*TQsw`u}%5-$wO#Ms89O)Vk=^YWqs4a`$h91Q}ha(xT6 zb3(H$$_&tLE3`=UN>5kts7lRn$_WZIH})zBH#c+)cGV9t%P+$)jmpipNOjD1^v0Ia^;vT5rr=L^ewg}6p~XMl44~HRp91xUcV47|ik&_rzQD~lTnvzuH8;D_BX;hVyak_$!VY;E8K~Ys`u6|}nMQL_! zNK|E!cVwxdae8@4W^sXmuaAYFet^4=vm;lQsaHs3W~Nb&d%1p*pSyXMV^v~OW@2W! zdwHlyq_&U0dtiiRP;f!2ejt~wuC9WwpKnA^UXnqcvv+_|rfX5DM@F!*zNKMWvRS!V zNTyj?MPWp?Q%;D1aXwebR#!12;aRy)j@jI5TFapBl_(LgRo7)Je_iv%-V2qrcV@Ch xOV3Z=Bi;4z?=L>D``4l-Zn@m>u{<~1_wvTvI-e><57$oH)YpsZI#%dE1^_c)ahw1E diff --git a/secrets/forgejo/runners/token2.age b/secrets/forgejo/runners/token2.age index bd13ac11352095ddded648bba2cf40a7d46164f7..aec16c6e23de8fe0b497f35b5aa1b68cd158e1e1 100644 GIT binary patch literal 1138 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5ux9cJ?$* z39KkiG>UT0Fo-G(D~+lQ%W=<0%5`y%$|wlXH;nSnH_0%_GvO+Z3QN=u&h_`sPfH3c z^vO?7b`EncO)gDxa*5LRHS@{}Fwc#2F)R*9$w#-%B%mrPKV6|LG_p9=I4C_l)YT)* zG`t`&BtJhQ#62h{swlwEGN{ZnJH5aq(9JZd%9G2)IU>w0w9?th&o9l-t)##&!ooB# zsjRY~%srzpx3J72Im)e~IMt#s(gNMK6i0)ypmc?_EGM7BV1MHrf5&XMEYHw1fqx{O8y(>H_gECW# z3QPPQ^$pN%E3`=UN>5kFu8K5qa|+7L^$7Q`aB?;=2=Vtxa*XiEN>7c*4=VEVOAPa< za`w#3a4zP`@G&Y*N%2oB4J!yYNDMOYj0i2yamvdG&8#RWFUd8^^RtNZaVyXBuE6k{ zcUX}{QMp21S(2xRk(*C|wqasHly7igQfRJwnY*Q)ET->q@g2O_+ zqKvc?L&A$P^SlE63eCfubEAA+4bqY=9nFK&1JX-MvI5asZt%`)IBbaOQKb@jC{s&Y*6PEHAP zs>sc(C4t(GBZK9tu(62$v9oX-y^5cG{ViVv>+)b#5Kt` z(>Nit+1jv$kkUn#H5@{S65fTExml8#w^<+kip< literal 1138 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5tqa74GwB%mrPKV88m%iX&oqeMT~!XV0{ zJUc0)*sU_nI3+N}C_gJK#oREhAS=r-+tA-U!-OltJH0H}(bqW9&@rVr!?Cy`IY_(8 z+&`?aBH7|M}xAUbcG_*^kAP#A0vx03uoi(B!lwAjG&_Q zOt+wdP`^~OAQy{>l1gJkzcQc9d@f7#!cs3MvvkYSjN&X)gObA3RNsK8kbGmm$TIgz zcYo7di=u*J53kI`a&*6$`lVPJmn#_fdl+ly8krks1(v!;CYMDNex+GS4mAK~wJ4fUN zxcfQ=S)kiiXp!obo~~fv=v)+@>k;4=7FO&P>gns^=@c27Ym}5*Y*HEFXd3RFn&xR) zRi5V>=*X2>Wn7+OTICd+o2g%vTWDxn=w)b76y#HwmTnPfT;!G+YMPxxS^?eYH^isu(`Xtv15`^T0}u+Nin)@X_<+JseuYr zrCz25iKb!t?s3ciDee%`Z?uUp&8D3#aSt-5$RmMQJGGbCgE;* z`j!TH24-Q!euhc;Zsp<5`hiBN`X#w8-W~;kIX(q>h8TWxF7yv^4^(iA(9W;OD)GxK z&W@;bFLo@BNVN1Ri;D6H@HeRn%lCFk@=Y`Lv&=0COXo7RwDbrz%nK^c&-MyWb@$KA zcJeJxHYiPsiV95i@e8XmH?DLs@(;)}_C)tvX;hVyak@gbex-JCRCZFOyMBpVmXS$L zaba?Sp-Z5Xqf3>urEi|AMUJh{p;=i)Nj8_RuC79;qfcsXN{U%Xuve~2fw`%#Z$XZ>W2U!HZmFqP zc9})Exld6=L}<3RTOgO(tF0ch?$3$O6TT4Pe?hkS%O#f^ON#zpRlGE3>iVMJTbFxF y-HJ4Mb-259k!aG%(|a~aWqw?4T*dg-r{Yg(Cd2K<*n?W1lL~?sb5+ldi~s<834Nyk diff --git a/secrets/gitlab/db_pw.age b/secrets/gitlab/db_pw.age index ea6ef850b0b1732f52f20ee3993a06ab41d63d71..0e130b3d50070bb8b63b7e1376260407b999bdc7 100644 GIT binary patch delta 1024 zcmcc4ah+p=PQ7cntGQD}aD|DFPeiV7QF(ZBj<2D=M}=dKbCpR^g=&c?&W16=B_4_;~B-njf~Q&j7pM= zEK4$c99`U;D+-GX^xcECLyN+Eiy|^}{X#ADOI$r8!?PW^vb}Q(Ov_v=Lju!FLi0@w zw2eZYolRU#GtFFlvmGmf@}l&;Elet_ob>}IpJf!U*LO;EO(``uH>*n0_e~2A%*-;- zt_-gVwPOJ-h-+%1yXTO#&UGT%0R>@`^p2O3Ex#jf*1uoD;L$%gW7C&BDX7!+ebmGt4U@ z-Sg3{D~+mhGEP@0a&{{#%BieO4oeL;3(yZMDM>4E3M#1dDez9NFpJ6$^!Ls8aLTsu z&IshH@H8%PGEJ?wG%L*w^v?D6^iJ0fP4PFb2y{#jjmj#wh)5|aEcdOftgMLS($&>f z@UJWg_jard$kESBOpmmT%JuXv57jTr2`NZ-O|C4+DGM+#jLfz$HS&n$nyBfuPp6I@ zTxr~W?(sJJqh~(oXv}tGe74@d@hR`Kf3p1R`3f7Kz25V73y*rX%ogoyPjjM7vu3L9 MbE~>DdCF&10QkmlJ^%m! delta 1024 zcmcc4ah+p=PJKv8MWKg_agvv(fr(jggqxY6vv*p7OOU6whet?IL9%{kRi3ABN?>Ma zF;{qadajXwN?t%#mXT$NXOW|CqEWGzv!82XkWprcV~&1?Z(4v)nNeVVB$uw8LUD11 zZfc5=si~o*f=NJCRDQaGfv07Lwu`w-R#16qLAFP@i(9C-XN6Zzm{VwYd6IKTkYQeh zMQE~Xu31Dnm!D^3Rc3CayJNmZeyOFglYU86R<4tww|PdXQAtFlNrZ1uW_gZFp{GIi z#E;_PhN0SqX`!X5rAFE2Zi$f=?qPl=PL4^LZsvymW!_2d{>~=(Q6{-z#@YE?`f1)3 zxvp;E`aYJ9`i5yPo+YWNA<0$x!Tx1NCLVstB^DO>iP#_^b3rA9nC`0JR+*XBg!0otGqMH_45oSpJf!U&-Hf+EpiS>vvhaNtT4z*3`q12 zEjB4HHgvIc@-@jQ^+@tI$}KK22=*}HGA~T3@YN4bv@Gx~a54|c3XDp3%Fl`jGA(rR z3U!JqE66D>@-%Zz3HCQYj{)znB8#GOg~}wS%utV9SO3b?;_!-;5ZC%dL!W?hPg5`b zfWX9x$V>yHKrd&<(#T48M=qcIpg=>@jKGvIcb_cF0w~Ueicc-#Y?W8=% zM5C0dqHO<26Ljm+G7}9`0~G>GjevJPqTyjh;-3_?R60_3{1N4)^U6$% z^fA&`X;hVyak@fOW7l0hVw#k-d?&UDKQ z);^oXr}OM~oOo{TJCFTk34O{RgybjM8!TA;V95o$n-e46m+usius*k&N9L)|@vuou z78`71udG>A>?%Kpuj6Hg@a0EhC!2g;Xf!8W`FmVxUX-`MyX2jQd-Q7DZ%91-{M_EY zH}&R;g8ujyk7u41I5=_Vo7+pSF&$&&dh&34-}$PSKlxubmI? ssh-ed25519 V1pwNA 2mRcx22kddqldRvOQY7i32z0sMwCuGlbCkJJ8vlJKDY -aL+OgWP6uTute1b5dlPG5Tz12KHeFlCG/Su9+MBTceo --> ssh-ed25519 4PzZog 67PxsXDuqXhmcyvNAu2jZrDtd+XgUQnEakPw4pR150Y -nOCZQmAhHCptlAz134hin/UKKpuIL+ueRJ7Kzhf5Aiw --> ssh-ed25519 dA0vRg tiN/eg2X6g4x6KndLJs6ze8i8brhXcsBqP1ZWq2s0T4 -1lx0Qqo81L12eIG4XfQUWYgpimEfgaPweZQ65GTHSaI --> ssh-ed25519 5Nd93w Iq6wxlnODEkmZaYpf1s3XxKmROa/JwXLdXOtCpXuM3g -0oENjjsAh2c5tIHNEghw1TE50xRfU5yWHnZenYT2UgA --> ssh-ed25519 q8eJgg HrJ8YlZTp7YhRpKpv5ZBUbxv/777ATRtYzcbGH1JVhI -Cytu763lKuwmLLUhFJo8VunzHxYn75YRLiN3vnhxyL0 --> ssh-ed25519 KVr8rw s60G0Eusw0rEW3woOFeE++5C4vI8L6NOUXATml2egBo -tPGsNcE3H9crSOCXCkktBzjRq5JyaGvgmx0ZIs3ehOQ --> ssh-ed25519 fia1eQ P7oFu5pYYdJu2fcqTYbKuENBWiFnNVQxg2N8QAXNVhg -aZUyPG6FpfFo7GixaofYbCeajExpKFME6PBb6fTzk6s --> ssh-ed25519 uZzB3g hP2SPeZNhsmePX55N6g4Y8q2KIwRONPBEAqSp273Mzk -y2c9S06vYQl9v0G/7IrbEx+kGv3DOnpz6+9+vo1o1wA ---- 7prlMrCmXuXHtiD1+44Pg0LV05OvyIEF9fYkCiLEv1k -_2":Go*.T5.(N4OS6U1 CcO[Q Z#I1 cӍM;/~`=&'?n}e#/q ۱`xjh:?Υ/J3.+OxkYbkdϏ \ No newline at end of file +-> ssh-ed25519 V1pwNA HYKtH5eSIXo8kMrS2Y15Dk5h1rACkzbFp2Au/2JExHc +ei3/hAN9Uars2aH62Ri6ue9N+tX29yxV0cTdxDThXMI +-> ssh-ed25519 4PzZog HtprLR1voqpk5ESBcCBNUfh34Q6EsU/3K2X/8Vbth2o +vbYCsZvSXCSB20fLNGwWbUgLkPrx7aRqwMFAnWdy38E +-> ssh-ed25519 dA0vRg ix/hHlYzo63deUYDx9UnW5DkJlb6bY9InUZ3uaICtmk +qjDwnXymOM0k9pgvfw/XNOVq1UoqZVdCx+vvPiPUDng +-> ssh-ed25519 5Nd93w O77U44+F1MkFUQeHufrlXFagp4saKodduMmbBG6J8Ck +zriyFrdnZ61OuMBUtUIvye4vUZ4AFaySsNwTiJmeq2k +-> ssh-ed25519 q8eJgg bzoTPXyLF5wiScYUKyob6E9BE5/cA22DJJhSL+jLgEE +0oXd/EqGnpxpAaKgWPHw3Keks4UEldfpbc9zMc0nrVM +-> ssh-ed25519 KVr8rw g+ht9Go3cMVPAzUkxhsM1zj5CrADjKqbWNVgPTIJ2Hk +ryMzelkyfOY/IZDiE0gURovSm6fzuBsJfwr4row3J0o +-> ssh-ed25519 fia1eQ K7HJ1EJQmjVeYLu6zYpTjWbUDOTZe3m1GwSIbnWa8Ck +WSFnQ6RMQMU6YXNFwEPRRymlFMTSPCW0B7wE67k8JTg +-> ssh-ed25519 uZzB3g 0/9ETo7Do0PxXog0PM+/rylYK/lf3dgcv1AvVS871A4 +/PUIHJx8tsX7vb+ID7W8t/WPVoFj/6iiVRFdhs8sEfo +--- j0TLY296m7nfn9xagQQqMMYGTcLt1bn0Uu33CqNKPCg +b]P3xM{Jmu  RŘ]B(;gO r6 Z0nTR8]|T&)W̵ + M"zQ({T$\N\T=dϯw):ڹ1[*N1NnL'K9~MiJ5[H!W \ No newline at end of file diff --git a/secrets/gitlab/pw.age b/secrets/gitlab/pw.age index 6ef6846a207a94a4c0b5d046a9c194c60c504abc..9002d809236e5e59015ed2570fcaecaf173d3f18 100644 GIT binary patch delta 1024 zcmcc4ah+p=PQ8hROR;IVlZSCgMo^M_WO#&YR&t=ZTZVySa$r$ju6B~AOHoipXtASv zF_&*@Vr7_Ra+IT4im_|HX<2HPQ(8n-W};(=QMqqPlzU=kWQLKxnQLZHB$uw8LUD11 zZfc5=si~o*f=NJCRDQaGb9Sy@q;Gj)xqfkpfn#>LzFW9+QBX)&gm;pmqi154yPtP@ zglBe6VPR!9S8kGNv2n6-nPE;rR;G4Qgj2AmYgk}PW_o3SiBW!0N z3jBO5($kYt{gQnm3IiNV)4~c&BP@f%&HVExpJf!U&k2gmEO$09Pc$ql*Y)6;PRjA*%F9Yh4-a+r%Pt8mNe^}`&Z#VOsSGfW2=?*P z5BEs6F!3tZ4l*zBbIUJBj{)znB8#GOg|O_@Qe)@J^wdNr{|No0(&T!7*F=}ns0_pW z+@hrN(0q3%OUu9tmjDx2UoNxEq|{Om%OaEDTwm>o(tNLCZEpkDs6sP+AKwTUQ~gR8 z|1h^mrwUU~Pju_jG7}9`0~K=9{L`G=Q;GsBe9FCwi}HfJvV9AyEOK03{L1{(11emS z>QnNPv~#`uB7C{3QmXumjEX&dt3tB06Z0*NlH3Emj0@eoN(=%F%(R^oUHwd*LQS0f zvmDW_D~+mhGEP@;4)D(__AE{gsB-cP_b4~aH*yY2cFZ*?i7+zq(XK4dcXY`z^$kc$ zEl=k%D2((@jqt0l3NAB_GR+9djx6$v^fxv1H1y<)($&>f zh;Ru{&Nt03H1_f-j<6_madb<}F*Pp;%*?j13=K|BOU!XiGc}5|EHO*w3S}(5(BsM) zY4Y{3B%kiS2an2?lGr1wb5B2*crEk>vt@MNx!u1uF6J|hD`zTXxt@A7!uofaC_{LH z(1Tw)c59?sEm-pSo}ZCV&P3-B1>G$<=h<|xFg@>Qn0J+JH=9-Y`S{~P*kibX|GaipbwX;pfWU$|wKsc)fCag=_JmvfF|Vs2(eVNQOKVUbB* zI#)(&u3@@`hfk6vX}Eq^NQP;CNL09!S#oxAMpTkhHkYoQLUD11 zZfc5=si~o*f=NJCRDQaGtG;8FlUZR%RZ5zLiLYmrvzt?zlezrmLg2myc(-xo>h>PHJF&L2gdq z#E;_P-kuR&0mUwUe)^7KA%W$EE;+_VDQTHiS;pBBDFMN5#@a@u`B}bUY1zJ9ULo#2 zZaF!A?pa=;&MC&(p}tQ3dF5%^nME1Sxh5%<=6+d*MFAnHnNG=*;~B-n!@R@N3q1S{ zOntq*(zGp8%Co%76N8g8^72cgDswFjGqNgzGyH-*Lh`b?9QC6d-Td^8igLXYlUyw$ zJS!4QJu1V@Qrs-GlZ}I2A{?VUjLjl_EZlr2pJf!UcMNvROb;n6bq)zP%PPq;%W^C( z$uQFQjH>Vm@HX^xPtgv|_sI1!4>AnoDl@8ZHOuyo2rJIYbSyWFH1W<)DNHIi({?cl zj!G)eGxAFb_A^c~ajFVLj{)znB8#GOg~EUo_oVOw^Q@>!kANyacY}J@O7BD$x3o%FrglS9K&U6Z*&a&r7r+#~WmtISL)EK2kI3td73%9HXueDYj^T$3`&Oe_mL3N6iD z(=mKk8dc?FoUV}S>gAqoVPssE?cy7lWSE>>nOjzDnOYcRWab@QTv3o?ZkAtQVc}k8 zoX-`MooixgT2h}K?pIXqU0#&#mYSAc>g8o(;gjc9Tx#ZNYM8F?mtzrW66DIItE;P! zQx%?HZj$Zi7?EROl9cUXmRaOjS{xo`Y-CuTpPP|b6z*!45@DY0k)O}S+aUDrRd>(a zH%DXsZdBaM67{u;p+w8;?VOp$tGP}cdD9{%`0t**>M514<#U?0ZBza5a^vm!ii(;n z-!I&fOLTwoJN<*JgWFCyU)@cS&$SaX&(B<7X7#VftZ3z*M_JM)WeXZk8sA@YEV|!~ zvC`z{Q@6J_r&=D`eEFW@de?N$o?51s-*XbT$OisxHqEnN`XX}D^tNBG|1V8^7j$c; LgMmTfjKUNEoXBm& diff --git a/secrets/gitlab/runners/runner01.age b/secrets/gitlab/runners/runner01.age index 59a5614c6c56fa7b10b14165914d10e98c07e747..60eddc91c081b64600afd01f38c193836cfe7729 100644 GIT binary patch literal 1175 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5tnHcFIgn zOZNA4weZOfax70ZbIJ5~k4Q}q^0Leb4J>mhOY%+jOm!@9apWp8@JaIV*7pnZ^-1&% z%+2x1HTNA8 z%Ox-^*dW5hx6CP|Ks(v8Af?JAB*iBrInUkIz?CaG*xBF3E2-4W!zjO`)UYC`q98ZS zH^;v)CC{iVvM|gwv9dU;ydvDcFdf~t6i0)ypmc@I)Ih)TtnB3Es7%kCfIN54z%-W- z3y)ND|LpXTVo!H(&yXO0qZAVtqjau9)8ar^w|s5$h>CI_{Yr~WGc(gdv&@PpLv8(} zNXvkzO5}^a^9w42s>0mTq9WY_qsq+E$_k>&LOn_{%sj#z zgTtNN%zV*pE3`=UN>5jCb@nuO4%W`d4omgacS&~3Hp>pM@F)(=&ML~P3<@;%_4hII z$;(Xi3@zp=_6!a&@J=uCadA%xa?y|QbIUXd^UButb571JGd6Isj0#Wm%k_JTIm$FL*;L=8$jcx-tR&N-Aj37JJS3E> zO1~n+tlTrbEL=amQrp5&+a(~oGO;i%FG)YG)Gxij(ZoEYGPyJ}x6A`lYO8p=w{oG_O3lFE9kce~- z|Hz1x5@%l@r;x-fr{K^i$GiZuDu452lid82#K;^AGfxb^IT!kexCbg^==8C;0>xx+a?j7dr+81_q-0tu(62$v9mhAUi81S358?%_zhmBc~+G z(b6ro(85XIz$-nm*dV7QTszg(qAI{YC@`HX)Xz87%_}X?(JZPYGPkgx&@wE`)Fje7 zD97E*z{o2#v)nf`)3V&HG~bm=S65dd#XmCNNk7A|D#XJmC?~z3EX~QsHM7LsH77Bu ztSYSB-=!ch$+gVI$UmDax6o5))#k5_pA275TPL_mRN?4XSG|+7m}lk$Pq$EKke=W$ z^VzJ8v)p^mwC$HT6<@IVSi94Pc}<7^9PV7&QQJOm%JB^gs>13YtJZElobr-k#q(WD m3^TVjRCS8nXk?0!D1UgJnJYTKY;xoI$zf?tE2p+?-VOlz2#cct delta 976 zcmbQvxsqdoPJKjVWq?;@WM)Q`ae=;Twpp6DYgwXSsEJcB)ZS7Kv3Q*&*SH`7R}{CBYVDslMfj;hEl*76G|==9TGAuCCh71{PfUP63G} zQJIBh+O8Rvm1P;_>4Dz)xsGXp2IW462KjD*X|66I+8Nn-DZZ2A8O6g=vO*J9eM}2eQ%amt3-VHZ47^fY zs~js$^0dnf67!4-{VNK6gPr{IgDVZR!zQ0$l&DWGF>^P_Pj)giFwICc$TLhbbSW^% z&yMuYDtGqC)-O#nP6^8m(ofCLaOA42Dh&+@EDkL`M{`l`gV5dFyfBI6|2 ztQ>O#H~mCsXY-)KNY_BF^1J~3vdB!2+@hS^JTK!2AJf2;LJLdZEZ4LY?=+v3Ec0M} z?+~{XOJ@x0(lQebQv($Wj7kd%ozkO9%yTV`y>l{4jmsj#3!TG#JpJ7>(mYKoE$WN) z9drFWlMJ%CTmsF@+>4Dv15I4Z^Na%$lL`w`volK*0}}&0-78A`{4KRJj0!A_EW^vu zedk>0AL1UUkWn6*9p&hj5fJEOl35Yy9uSaPROucW>Yb93>X_u>YMc{T=H-`Co)MPM z<&mCIU|8i;?-E&&SQt?dlvEL%RUGPH>RC}y?iN*9?&|9tS)gy`n&+4i$fc{Rs}LS( z78O*ST;UyB8BtXkQW)&vmsR3Z*uVhT>gP zeofk+jgwAlZMIqR@OkvQ%>5fpR7I_N)A^>qd-KZdz!XomG^cQpU4I`HT@ZIW@p<>n zMP-J66nL_2Hh;)jBAVCc#vD9NE&9{(XLEzI`;Levoy>Zs>6fs0B5y|fk(0OLvtPvT M`ZA64imH4%0FA*@od5s; diff --git a/secrets/gitlab/runners/runner02.age b/secrets/gitlab/runners/runner02.age index 4df759a7c80bd0cccd87c9bcee8a133f8a88f794..50405a419dadb2f1b9f589bb16c1a2bdefaeeb0a 100644 GIT binary patch literal 1175 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5tnLFLp9Y z^a?lhH8#|D@h;~&PKP*B%mrPKV6|Lx6(YkqRh z(4;W0Ksz$i$o(g?OZoA&m?cp#AE~Qz#OM! z*RT**gW$wSuMo@JNS_RSx1vgROS6(plgc7eobtI+g0x*yOdTt|Gs2QxlB4vq^*!?(!z{uxEHaWU!+cUh)5|Lg zavdGZD_zlTE3`=UN>5iP^h!>1t&GaC%#SQLF-kTL42m%E3@QkBEh_O(^2~EBjdUuh z3JHxgG>YWPDD$(-&MO)IW+%F%WXii-5|$|{a>^)E-a z%{#2fqNrRUKO?dCfU&x&NOf<&*tKtIpi zL^nULY=7gjyqqvI%K{U>%)+32XGaqQUyqcmjI7i!&rnZv+nfviL)-%uj7s#&!z)tU zT_asA_5Fh@(hZEu3r&)9@?A~RN=nU>jSCDCJ;M!h(!=A@vt-w%kuFu4RSLra&dPLGA@WLFAU1(($5TcO3p3uHqJLP2zIIRHV(}fFe*0miVR8j@(FNvE6(>XayJQxaXf?y$nB^M9wccxM+d>@ATr1b1|ph-2Sbx zqUa8LQPm&rhl^%%h45Uv79sp$w@Ao?hO>Odyvf|p|Ez5?y63jTZe;+M@u3xBOAfy{ m{!(k9YvCNsFHV delta 978 zcmbQvxsqdoPQ9UintxJBL}5m#S+;X_l~0bJzQ0qFVM=9iVTxNxmV173K)6qeXJ|y0 zE0=a=zHf+SnNewWaducvS$bNseuPg@Ns(K&OF@{Mp=Dx@L6}itMR`$nB$uw8LUD11 zZfc5=si~o*f=NJCRDQaGk3ogAzOzAYsfU+AxM#9ovYVN+nMZ25Nko!yWNDOkWMGk3 zWtfLckw=IlmziNzRYbaTMV^nbQAn|YQJ$%1RjOB%X?kLDV48PeK!jzAX_0n$N}_4< z#E;_P8Ga=`MZuZAQ6ZM0+Qn5x?&*cb`WeZg?iCRpP6k1R=A}Mv&fekqM&Yhp$r)x| z$%d%~q5k?tZdE0z*_npsdFCPRW`X5dZoWn3xk<^vCS}Ebg~sKR;~B-nP0QTU%=`__ z{e3+hlgm;f@~d3E&8nO{z4Wu)3i2yc{5O3qA9^>)t4@JugE(l5+QHw!Yd$ni2x*Ei2f z40AO~E_cbut8h#TvGg=Rj{)znB8#GOg{1tjLYEAm$jUS`pR6!npX~bF0`HLI@}M*? z?aUP85a_!1JpGcAa{{^2jFN*xQ_QncyvowejH4B}XYW3S03Kv{ITGsB<)^~FXKR0vU2I);*4@K5rvt-qpWU}P#6y;@G%-x=~ OO!C_?GsLLtsWt%bT~TrX diff --git a/secrets/gitlab/secrets_db.age b/secrets/gitlab/secrets_db.age index 3043014..f5f2ba7 100644 --- a/secrets/gitlab/secrets_db.age +++ b/secrets/gitlab/secrets_db.age @@ -1,20 +1,20 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA AbGjaacp7Tp3DYhUzCOUzzNlUGXYDTU9vEv1DJpzqww -grRQCuht2PKdwsdbABRIO/QLX2HikbnnPDYDfRNeeOY --> ssh-ed25519 4PzZog loCPiNwbEIOtBgQnBRSuiCuizZdrh/l4lbdvv1/SYCQ -WMu8NXj0LYaWS0qxcuBsG/GdH/E8C8OmbYb2mYuRkrc --> ssh-ed25519 dA0vRg 4UnugzCjQxs4Xqii2PWA7prXrjS4wP3wJQtUbrQi4QU -HqjVoiYSZ70DdNRui4yZjR5oGiCyR6Rly+CoM0MEbxI --> ssh-ed25519 5Nd93w +PwbmFGDmpdwKvuHWLQOJExFZm2P8pl15RpRqeM17Vk -HvDt20lZsSpyZ8z2BShXHlAOzIM+15UpMonz3sqSwR8 --> ssh-ed25519 q8eJgg SYtYX+5Q35sygmo6PdlUzG04g2bGnSyVGgnYPkJKoCI -nrZN3mp0jxSQfblj0pDE/7/pO2jAg0byTm4HQOQzQBU --> ssh-ed25519 KVr8rw CzJ3Fn25Lq8zZOAHKKbLsiHhTHlAMDNHv3yLa7gaqSk -O1gss3s7y0VfE6ZS2GkdskeCfLJNytTNfFWz/bzEebY --> ssh-ed25519 fia1eQ WWju+k3tswiyQfc7XR/txDAIaIjX7Xfnv2IcbKH/s2k -mAxPhLCJjwX68AwGSkJxMSF5PkGPQDSCkBMoCi1Ozf0 --> ssh-ed25519 uZzB3g EbWWbRWM+8jrtg/ZX8AC8VKMOtf3ch0QrBn5QCia6TQ -8/TISW7rN55/vfkBH9HKx7GKaWAMIEVz6xmtCh5fjfw ---- +L6TvqJA1YZEmK9PDIzh2r5wtzB1BI+qz+i9JotMejk - }sIc>}5bTТrN1,4ONRzf=اNx7һ[)G gw!sN>#ggGҩ\kت2g#@ao47wx6mfCQ2H ->maH/uv \ No newline at end of file +-> ssh-ed25519 V1pwNA 51Y21teSJryE0zPWFftIdmaw+ajp7Fom8Xoc5EnZWBs +iDvtT3UwjuPf8MRwxnxKGbfGPg7y24JQWcm/WjOP3qQ +-> ssh-ed25519 4PzZog qZgoJXZsAfqAXKnIsktzB5nl00eErrn0hjevF9pcu1U +xUYDshqLKabFlmW4QRo+OewDFHFFuvLONaJnx5jbBQM +-> ssh-ed25519 dA0vRg sWKzaacPSC6AnLXWKPBT5etAHGqtzzse6UVsIIC/6yw +l1TZMSwnz6e6w6UZgPEOzG29DMCF9InQ5dK1H9XuPAA +-> ssh-ed25519 5Nd93w EgPejsyAUBLjgPwQmSH6KVjgNrFA7Y2UiKuAUjjqpxM +mUypoPJQJx49NDQ9esdzAi0KbfwcjQXGXa7IPB9T/SA +-> ssh-ed25519 q8eJgg EZgoUSh7Cjs4/VeGw8N7dEGaFcqA6FbdKfdTirlQfBM +wL5BVBG4lVJuj/3wkBy7Y/PMXDU9SvKSNmh7KVw1rHk +-> ssh-ed25519 KVr8rw E9d6+qCeB8S4ZWOzbXfNRgrYfKy2qfYj6ZT9cMfFAWk +GtNuM3DBYy5TyFZ3aw97BjRiIrSBkZ/g5p3QRMNhP/c +-> ssh-ed25519 fia1eQ Z1QtqqvvSEGVbJJSxU+8MizwWlDtoiT/V66Hoxw3Mjg +dKBCDtW+PfFKRkvAHh6oNNp1rHvfBXtpgIvOlxFs3Zk +-> ssh-ed25519 uZzB3g XqKGXqaeUiGOnvASUbdcB5BDTCRNrN7uqUO545F9zxs +Whs8NFVFoUZ7wY5FKKd3kplc8bVIudvxUUyZ0AzeXeM +--- S9gM1mjnuKGKAmZazNYfjNUAoQfqMmOUYCTxAvj1W8M +ޛXMV)=3xݶ?,yn!#'—wýhJFh#k p=9_X8(lN 5@֎nQۀ +SLOLuo <Hdo+1)i>c \ No newline at end of file diff --git a/secrets/gitlab/secrets_jws.age b/secrets/gitlab/secrets_jws.age index 25926fdc3eae492e990abedc4491e15fd9276b93..c7747b10eb0eb849495212013da2a3e0cb5ac77d 100644 GIT binary patch delta 2586 zcmaDN@wwq6gQ%Jd6m7}w}OQeajv3HPT zrju`ucZ6{TB_-KuNmZqOK|#*$CH_I#t{#DwiBYL}iJ6A}!P-@h87}D_hJmhJp%s=U zMvmIX$!Sj7CVsg&6&8U}sUF!zVaD1fC28pa7U7O5$)Uaxx#7u^;~B-nUG8%1GL7>mpJf!UuP6#E_e%6Pj`S~zG|h^1@p3gU z@GJ{Sb5C*datTgK5BBlQwe&9VGztpksx&Go3iB=Vc8e@A@^_6a4oxcyDXt1kGjk3t zc6BW^DJ@A)$#4ltjr8ri%fMl zEJpWTX;hVyak_%5MVfD>e`th3p;vfOu5W&ppIeHVrAK9OqMwO*gn>c1S-!q!cDjCU zXgQa;OJYQNiBo-*rH4;&XtASrSyE)Ug-fKDyP2a|dPTaSZ@RW|dSscSc33i(uCA_v zd2&HPMs`R}P(+Y z$(fx^{uM{cQD%`Jdk@Y~o+{=gVwh3eqvDk@`Kt6m=F=0;g#=czshizDn8BrHcuT-j z$98e^C%L*6e?*rg9gMH%vAoLXwD-x5?>vUn{Oz|DGR%=&DD&{3w`R(t^SkoW^KTa_ z{aO@(uy^O( zDcxzM(gok=-OXy^{AiuEw`3aI50>viqCcu`J-8>Ko>gpHbt*M><6$oQyY+W;i)NYM zoUzhJli_Ip%eq(3Zd%AEv(zbkDLpY+#Y{9;_`E;pHvH4=n*^Z9LB~<(lnrRrfbq7wZ`3zh*mgP`aG? zuI!1v3vv3JL_79zhea7~R!tH3Y_Z;^-f>aJy!P5lu1D`hUuKtX^RnG4Xwa_JaM$hK z@>yb4r~cj$nr6r0-EXdZVB+VR7_HXZtC|crE}DoSmwwOIL)&JUGqnfF=&9Tcn!MuNq3P#e|2W%R z_20k#)DQQXvF@PWO4GR>q5YsmrrAzn$PWEn7FnM7jRdT5X+d-RDf7@?ICu`~Tj1 z*P{o&TK7&my2yY3yA}(3E93Wb6JO{mbnj%%f7xugFgCGF#JcuVqqv&<&6Juwdp5mD z-mxO4_WH{7RiTloFV4CjN$Ed4`RkdJ^Ui0M=T2yTC@#zY=Jw8eR{WXMI>WM?mMz=+ z<4c^I%92SdMN?0#@vlF9xN6CZT@O4rwHj>N={V(y^q$D@Fg`&So%6e2Ce)tp^bJz5|TvdU+;(@1Wj$8lf`)nx>I@ZGe;+LgT?!{ATm+Md7G<

zQr}4TNNT(Lv=b|5gk7^=C2?SrUlPad?|C}B-?beUS>2t$ou%Hl)%CWr(fo-06;5WG z$`7kdNse^UEKqlC7nrkd(ajD;Y2Jf1Z)#`HnfaFEP^VIdxr}k2!=`{L%gHkeOOx+; z_`4^rX%-c1RsH7QKP`2Yr+fKo^R=Aye`jtf<9}*jEk4DuVRuA}&NUmJtVsuJ8aijs z-^89NzJ8y<3Il#A%~Nv6Ja7I#@*!@;_Cp`1GM_oUx*=HW*G!(tlh&l|c=V*nIpy8< z3qSI!J~TM2n(M$&eeK?v*GGh_rRBE%Xsr_Z&Q)moc*m*-7nnNctO#E1v&+cjdgFfg zs?W>ouWVkoOQW3s#=W!6&scsQR5R3a&sKZ?rH&@ z8uwNgvNFqA$V?5{!?}FUgRox@#AB}6TJ@}bwetJ(zM}g)*SxcreF}B4@xLCPsjRNE zS4_y4hjIHxpXgSdIMx!ag^I}$H~*M+ecHe{FFIM8eOLX%;Gfm%-e>K%aYjmY+3C)3 ze$XFaH}~hG&o&2mnFU2HKNUAxB{=2I-Z)39O7U65llL|k&Q7RneW>8^XVZ_Lu5}tR zAHsD?_V{d>ta$zMHJL{jawT8yK6rQX{m0C+xBckVFaEjZUQW>3MVp@~?TkG!ZwBw0 z6-!Gm=XEe#{{Oexdw%^MVVh0rl6=j6(*!wI{n)qd@xHMA72mc?Z(rgOq^DkjEe_x^P^<HSwSFaRx2iThe6F6$D?>VQ zvT9U}ZOw}hzn<7Roi+OK-ev1c7ma6YJ}hza?c|@X%gBy`Hbqh*=C7%rY+4Fll2T$rjo&#Np87oP(WFPk#kUL zv9n8QeprPsSBayeTa=MUKwwE$xG{d!Rf!?qeo0Q@k^ZLUDUlYF;~B-noeRx9lM2(r zjEl0vL$Z7l^|QmxUHp=h9K&-XGQ7)O3QE$wJ@bNnOmlp>0`iS4vqDmQ!ZX6XD@uY4 z5{*)mGF?sm{DOk?LqgL6JzPx+!+i~twUd%3pJf!UFLnt?ceG5)HOt7+&kQsU$}0_U z3k(kkc8<^vDhcxoPcI9|3<@>~2+b(wN_F?m2=UHHG|MzFEy(gJbq=WXE(pudO*YPr zum~}+OvwpNH!CqWO*8UDj{)znB8#GOg<}1zvP%C*i%egWOqZYvi->x&(qhNZQm62; z;;_hy!j$YJSErQxd{f7~axN49ATJ-23TOA65c5cn3bXu(l!%-HAHVX#)bvy*50lbh z^WqfGK);Mk3v}z!G7}9`0~O5Na&t1Ay}a`aT|B+Avh$5xLM^<)la0%Y3@R$plFK5J z>vK!1iZV>ItBSc?stgk=aw1Lgi?VYHg0hp-qe`8_(sRAb(o=m6LtF|2{4FyJ4ZPD0 z3q#SZD~+mhGEP^BNKY-RGB5~A^NGp|am^|&2#vHf@prZKOL8*u4)IT`Dk^p|)lbbx z54PY+G4>62Pjsoz@elMX)%VxdFN)H3t_bjU&JVHls0fY73(L3g3-f z$j>Uscg`(z%F-^k$O^Tr3iLHBtMD-h&#Ka{N--+R3yZ4Cs&tApP0aG;l03fC%l*42 z|4)`J|1>#XzYKO^w@Nwtba~tvlMP|6g;HC*ORwEHwJao~w|=Qh=N-AonUktY1hjt^ zPH=mp9F*9uU^sKx42#r@W(+nh`V1S6X60pE{nW^JY`^L|{w+P<7j+1q=({k@(^@v4 z>-^W(e?t$N_R0KLnG*TlXcOzU+c%93Cr`>g&NTOn_7ag(`$BB4bZwb8<;-n$*zh);n>rU6Zb_F6ozF*iTJOPZrS@)dgc-- z&f2{@R?So9dK2Q&us#lh^E1&+pnbYih+0xz_8- z@kfs5xQ2bJKeA|fxa;pp%UL&<&%d%OXX~nphf`-?ah1>i*XGH8@WzJNI$8Fj`g0bx z2cksTMH3ultO^7^g=~4W#P!;-l!a`%GJgw>FrRGC-aT{S?Ky4B_iJ9i?v)uR^lr*e zqkO(c66H50JaxRVROgQ7>XUEcbJ6AiN-zp zv31_W=O3m|F{nD=Vll&Q=gfIhE@Hld-~1=lOG{Zr2!8JAh;IFO*`~APYM8}NpZ3GT z!n;%$5AAv?b&)Soxns`4M;SFtMV-5UD1PJWkMxOVk>|90sek9{O1{*WwsOaQUw)q9 zZa2r;=56=`J_$pgle?MpH{6p*K3~s0`S-o`eRnGopKs6qBjSFHX|4!|;u`loGnm}} zdusPQuB~U}Tyrtv8u2WmsULBtCa;NC#Gji`X-rmRL6X9OLIeBr1+S1E+_U*a5 z!t~+{_Tr@8`1gx~lMj^^Kees=afZvjX0p21_KvAq`Y#@z*gKCUF1dWtbAI7CMxj~S z#!dhJUpN`k)F!yuBxTcaMP9uXt;Moezg3>&p0it7zU+<=_mhs>H8skY9I6BC#aakOwV6r z{q9;(~Y-f zmgos(+?@M$lfrEyvA9om_ceDssVZ%mT6}{$q1kTM+2Dw!d#@i{U2n_8@adMAnZI@{ z-?O7_GgEp${CEU3lBTj&-L!MmYec$_L~{I*I2H3AM2hlVY7*wsWcfZ_efULAR~zTEq{3{1|Zm$A*VfcInl18NNFn zJH;@bfnVipo|)=~SI?FoAW-+emBD> z_sBP;9=jN8&aZ9cx#R9*_t}22+g7IPV)d8@-#JC?UY)zp!CTFk)Y^7q&g8z=#?8DO zliQz5yg3zQ{#QUtd>ZFF?mK#B({_1HTO_QLzvRB4Q`yu+jO&5>{%YhgVWdWv6xov u{dnU3{j0{MA?n7vop#ynxjt*B@Rd)3Z)SHkYoQLUD11 zZfc5=si~o*f=NJCRDQaGv$j#Hm%pQM*bd{bRQtCBJ@N<%HPLW+XjgVS9if{h}%B2to!^veq(a}u3>ef>+4 z^F5P_(!-OqOTAq6Q*zzXd@TGT&9jpN%!)iGpJf!U56pK8%y)7MudoPCH#RWx_R1{C z%rFd!@^#L24s$UJ%Z-Zg@T&@sDs~U$@-hi3EDAHt%JeS|&PXcE2=j@E3QjEb@yhk9 zC^XG6@%A<{4=_x0OwI^Ij{)znB8#GOg=|Y>FBARrAXDSq0<(a;sF3>5uz&#n>|+0{ z@UT>iKyT-wFrR?*)I>*vVyJ=HwZmQYE%E|9 z>O<2DJj=DU4MVvc&61Ns3XAjHsw$%ND_qTror<(`lZ~THGE0&TJ%XG|jNQvUL#i@D z4NTCjD~+mhGEP^Bh{%odkJ2_O3ikI&b14qi_bB!a@+vR0%<`!!FHA}<&d$p=%P?|v zb+X_x%5t*MuF9@2Pfu~n3(G0Ub;)(A3^zB@*AMp%DoZNJGRrhJOpVH|G_f$?($&>f z2=UIUuqdl?^sfkxC^5B2&doIm%ryxyOA0dZ40rSP@htMsDX)wSHgR#}I#sZs?@i?a z<%Kgvca$(ZZ{EXZBM_e+Uvc@zyjQM2FCTh;rC0X&_qjXvT9)mY|H16TwYaBJbMH81 z^J=T@3(0q$E08#I?gP~#Z9!E(xi^om{gZBQOnUt)(}&&jz~-3^S6qC;zx%t(zWUW` zT`yHKQ=0wGnoW01XRJTan)mF4#ows~ia*1uBxZh=tax@KaLUCH{qA2=FR9EfZ7-k2 L%HD9;c3vO=hPGzJZ~ML6~K@shdYyQc+n+m|0pzvUY%lWs!4* zS4p^eXm&;G9vT* zvI=~1^IR&-oP4tbTtkyR0-bz9Oap^Gvb6p3%fdX%%gSB3f{QK96DzZ_{ft9Qy^90A zlk=lWGW8REoZTV=!h>?$d@BnKbApmAJPOk%pJf!U*S5$sHOmVOt8h*-@%Bq`FZL=n zF*o%uC^5IpO*Tsoh%!(2H_ndmurQ3|@-@=-$c=I=&a2Au^NT1+(@!@o@hgkS4=f1v zO7tspcT6b^De~}1a;{27j{)znB8#GOh2n^)V4uXw@+yDl2&d5ST+jOQNJmfO@UprK-@(Qz} z>O*|OeKI|&98I`V+`TfLyt4Cr+f zNHqy7aPiE@H1bZ*H4n)*sR|7Z&Z>0xa57EK&ouKk(RR@fN=r=*F>!R{@;Sq6!+BSK zU4!W>(O`~qQ_ni3-1_>)$b6^CU6)&$zZt^sBt9-Sc5llb zdES2EX|_tg<`{7P-zMAi;hFKZXlaF{@YkY;g#P?JG(Yx7-R;%)SN{4nKkD@TtG9UX L&RKp=%WMY#kydSU diff --git a/secrets/gitlab/secrets_secret.age b/secrets/gitlab/secrets_secret.age index 60b9321c64a1de3d3664693e0b0a2c0ab2c452a8..621e1b82cae3a34d69fcfcd630e39b316b792288 100644 GIT binary patch delta 1022 zcmcb{agAewPJK$Te~FVU`g_oI8s#A85TbQF!m~oY*YiVvopru<_ zF;_@_YCxK4Qc;nao3>-ViHlo+cSVSEq+xbcxoJqSXF*bFSx8x7L8-Y#B$uw8LUD11 zZfc5=si~o*f=NJCRDQaGaZq-#MTuj$L4aj=qJO4|i)(sHQbDdoXhD{7Qecitc2bn1 zm${3%V_s+|mxoVAuxpNGxQnY>rjNI4Rb^g*vwn7Ev2%)lMo?ZvV6MJPMPg;Tce&rh z4-(;(>Hbb0#ZIm{*`|432F}i5p4u)Ej&30tg(hjvNhKzs9{y3LX?dx6+1XsCC0CeaxG0QJj}JjTtYoP!%Gr_ilh9CogK@{(*wdnf<3vaB8<|b0`xaEJ{NwlL|d6 z0@1B2jjD1oPFE<4Do8Ig@kmKA(GRb5GD&kuwFq*{b9Ky)3JP=c){b-zb4)b~jVSUm zO6MvJw(t!OGpmi%fA3)i0?uDbMH9)zwwV z_A4_?4RX#3C{GOWv&al^3CXAo4Jf1=IFDR2JWF6ndeB(<8g%eBPJe>aHQjBj0GaSgq4>7Uc+yUtf7V z=v(rp3I2by)+$V%%63wu@+&LX-kNlu23F2)=T&@UKhPJ1LCzr0BLUD11 zZfc5=si~o*f=NJCRDQZbsbjujfTg)XxJinUzI%3nwyQ}yB9v<0|W<}<%+U7;(A>nSumf8WS9{E8fc_v)0ksgJ4 zPG$b#r4jjVS^3$1!7e44X3lx}QKeO7W+g#^xw%C?S*51NUgeYH8O6i%yebWYLftA8 zT@#bFLrmQCjr0S}w2i_ugA=RD({o%yiqdielQNz1jZC=G!jn>q4Lwc0%qnwDoxS}- z@`{}@11d5MT}++RQmV`=!pi*JJ;HN6GeakzWfZT^EOpHF4h=T6$S93+DRIy8uSm+) z_jj)>Ff1-hcQrQ%Ez1qb4@kB!a7pH>vMe@t3e@%qbMnr}@HMndHMFQI%BW0<(yl0V zPc{n)(k?LdH8&`542VRJ0PnCOi=uLcP@k&gq^NKM*8+>Aw8#Jx_j=FV%y6Gl%Ro=3 zaP7n>kAmd%)a;^&G?&~^F2m%Aij*op|MW1w40qq`?G5m zWXsZ&e9sb$_)g1AG)xUt2r#eG_6R66&o#@5s&EN2;fks#bd1z@cMXUPwa5tY^oc0(Obre6b#+cNFikEsPRdHn^(ZLHFvzhi zNB3Q6RF#u)x`K9DN~Kv=dPJG8sd1jAw@*Q0L}sx?u}`*{S*U+iWR7--f4NJ9r@4Dz zHdkIrv39;mczt%JmuZ!`fuT>fWl(08rD2Mze^yjwWJY07s(xfdaZz}=e<+u(uC9Vl zrlF;KUa+NpzIUiwW=^74xl5W!iKnG;hFfJ)RAE|SPFjJxdrDS$h6R`YvOn{qC0+_% zV=!NxI)BE~*FRHD54Gp^*(ztd1zX5CPkQIeaC60~&y$qOt{r#V{q0Cdipjy*Ut$6! z7TkZ<_VU}ja}{YPt3LWMw^b@`n9aTMY-_8N;4PnkhYcY`a|~zhu4=FI4*CBf^5l}F z-J8q3CfLq3*pi$zoAtbkO61p;PoK?rKNW60l#}>-7OTRW?VETR4+u=@UR?f@>)@Zx K?2Rn@{{R3XFlzGv diff --git a/secrets/grafana/pw.age b/secrets/grafana/pw.age index ace35e4..44dbbc7 100644 --- a/secrets/grafana/pw.age +++ b/secrets/grafana/pw.age @@ -1,19 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA CGCG7vFUJ9hUdJWRax68aDpHZEREFnrjo3expN7oUTM -/eCKERrmnmceosD45BENTxtoyLmjGmGVvxkGWAtCRyI --> ssh-ed25519 4PzZog DSUIoivSmbzN0AvKIPXhtjTBft9D9AaRioe6biuh6XQ -XlV7xKGi2BY+sCgJCEiSB9AlpXFoQnbeIxKxNhPRetY --> ssh-ed25519 dA0vRg sYBG5Ld7lMw+cm5zUgVR9Bi8YVwDrRglII36Tj8Jfl8 -cQMY6UyMrRtfoU6mn0pg47Vf4DB2KcjwiRHEmvU/Rmg --> ssh-ed25519 5Nd93w H3k1nFMs8wkqsVKzGp3n4CE7MuyxJWRZ+xgSgDbnuzw -2fff1rsfvE5NikWjF9gkvHuthgLKLOey3PebYG26yNs --> ssh-ed25519 q8eJgg UR21V4UAJ7/ALE7IcfMVYO3mD2jbanhBu1fj1iEjpBI -8Yl7/sLlQmCvGJvKZt1B4lJMSnPt6gHi/k1u6Gm2sII --> ssh-ed25519 KVr8rw ur14/Gp1Z9ODFFVaUf50i4+ELKy9RHmsXjbaj5h9IGI -FTZn1ZuBixaehBW3hnVjfXrt2m8co1KSp5aUTA+TRdg --> ssh-ed25519 fia1eQ 5bmpon54otL6GnIhyYT7CbLuCR8vk0td3kPBGxsSWCU -PSngrN6yQODB/Vmu8ka3vvDv5DkShktyOWrhzC9K1LQ --> ssh-ed25519 rmrvjw J6YtkhTuDaUtc8LUp/zfvQD3LST00arsbe37bZw4nAY -r3TDmtyB0Cc7Mx8EXb1yytvpF3+4//6cy4jkK+cWTls ---- mSjAJK/sd2Qj4Ffuee/T5LTADcNLVTCcKL/4VlqZvd0 -RU$iUXsf_o/&c&{*ي/h\L[%=,Qq \ No newline at end of file +-> ssh-ed25519 V1pwNA wg5YKE7/sMO2/uHVH21A5Ezp5jTGyWICQE0hjgdOPFI +0BdMLvNfdkdawh6+binpY5cP3+SUih9GqXqGRjIMuPU +-> ssh-ed25519 4PzZog ig5HQ0wsF9mdSplrAA+k47YEnLKXxsq0mbLSBcuhLz8 +j7lejLu7Nm7rscsILqxJ7c2CTV52a8auuzRfuyT8tyc +-> ssh-ed25519 dA0vRg A3FTxSbl06XeRXwqtSEdp8zrbNRrYEhIzxggBa87yFw +MDLSG1m3Ss7mRB1D18VL1XzEPJqUJTay2BCgRrR2MTk +-> ssh-ed25519 5Nd93w 7FA1lC5wmw07jEoTAJteqj25VU9LgpS4aS+UDhfJ3Us +ss6DD0KevDM1MWr9ZtUi/ZwvRi6KxAHUvQoQlhDvhso +-> ssh-ed25519 q8eJgg tynydC/TKwdRGYYFhkOUeBSQhbReny5WqFiksVBfhik +uuvgLJZGfeCIudTGb/E91YUWtMuX4Q4+dP/ixM5ppr0 +-> ssh-ed25519 KVr8rw 0PrEzDMMr5NRKLPwh5FUdsK+IgmmOaR+vsjkRlaPaW0 +12tS3tR3BAEBTVQunX//RAXefZ+b422Q2uaDViMPcmw +-> ssh-ed25519 fia1eQ Phy3mMJqUjc+np7zDI0UVeHEMF9aDJGBKQGeNDWWcC8 +/B5W/0j5Ziq/ToQKswSHyLaVw7cl5DyQ0PhhQK8MnkI +-> ssh-ed25519 IpLDOw g8f5bCJc2CSqqNi5ZbzykknpsWFEffdEjT+ZxHkUZ3g +sSfMc85BkNYiDO7JKm3yzK+dA94qry15c/GyZx4sTLE +--- iE3MElTwsLIYXZDjxLu2iz9LU/NieS1hbcuFfMn1erk +?Q1uLL*;)!Ek.qLچ hF<Tcu=;9V=5n^EETcexndGIPSm>RRXIi4~Vj584?wOVx=#k@|0{y=>ExCgP?YJO;_DpY?B!S#7#{3n7Lr!zT;W=2;Z{&$nq`zf z@uPTnV!D5TWmb`QT0~Mrg+)M_iC=1@UzkyLdS+rlczAAjNQkk1XhlheZ>9y8Ns_Nu zUPP&ZZ(c=CWQwO*QDI1xv6p#CR!XsJREcGPzL7_`X_QNrzoqBoct-JXU;P3P^GYXk zpLG57V8?VvCyShjRR7EzCyNL}lkgnhf*^}v$HFQI+pR5$0@WNcrd_$8WS7U=5zXB(hoZQgKXBoxoL-gIu{0&N-3JT4A%gPKwoyzik zoRTbaG7OE(%Unz>%=JUvTwS%DE7Egn zTyoM9{VGdROLGlE{fe{EW57GC$fBrRA*(ne(m6ZC%|9zDKQq%K)u28#H!m?fG1)C7 zF}xx;(J8g4Ff=*eIV>!sn5!(?H^bB<$s^aqI6pG9EG)>_FuB4YIW)*QJT;0nP9TT<9b1PjV9m9;w!(2+jqx6F+O@iD@&C5)k6Z1m3n2)$S+x=17 z%)V53uZ696QlFgPGq>eRx(st3-49GqJaR|AE#R=E^MY3!6pV^_yXQ@}nB(bZ=oRUb>FH(Y>Q>;JryZE? z%T-w6oLZb4QtD=wSn6q6THt9AW?AGFoEe-}i7+!li4cP+Xj$ zo0?)|YHDbyU=mOjm7lJV8C+JCYN1`??VMlbmXsNh?3QfdW8jx(@ zYG`a~U|Jr@rCnH>T3QiamF?u=6l7j#Sm2T2l$encT$t`1nOoo=Wt3RvtQ~ApYE+Uv z@uPUSuVbKPZkk`7ae29uL55pmn0|P=Szd*&VOe5Yet~1ES7lz1YjRR>nWH0DSeA=n zaHWZ1fNP~;NT6wWvVM?ddWK=TpMHo%rG8SVV~S@6gTW57GC$fBrRK|j|i$09W=Ak@jVJgnFy%&k7TJUlJjFw>yK z)7{j|L*G9@#52v*KgFo9 zRJ+*6!X?Wx65YDA%tXV~K!xlKH;)Lv^nlPnW6S)If)vA?@XF*O-_XoF3(riWg2eLj zdbdc!GS7^l;9@SLhz!r-fT9vV?FfIToRA>>V%Nk(chd-GpPXXPqWs9>0{=wUD(z%n zBMjepRyq0>Ix3W!g_~yQco!DBR~Q*pI(tDcYrh1rG8JlGmhx=GK z=W}^xndBuWXVzEd<>edYT1I)7IHsn%Rhs5zIl2d1m}U8z`xQC+m>c^9`6qMf>gp=w zdiqs`1V&~>IF}k5S~zBURiqcYnI~46_=LJATV{p@n`b0frn&ir1Qv6#j`hW@H=oq4d%f)hLy diff --git a/secrets/ldap/details.age b/secrets/ldap/details.age index 3317f9c781e97deeb182539d180a94b617759a22..1c763b952341230441de35f6d9c59f1c55c9e9e1 100644 GIT binary patch literal 1637 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5sZq%eJrx zNh>lBjwp5s@iR6}^oz{#(XVn(^Nh?Z&8;dZ&T%Tu$t*CgaOLvKD>M%9Hge0&_BAdy z%m^?nNQ=tKt@1T2&#f{m_YZYR(Kd|oFE79yey@-xHKTs+axn5vpmf^*OMzbE6Uj{tgtdK)5$p3z%$j^D9S(B zOh41t(Jk1&D7ehCz$>F9#X~#IsT|$56i0)ypmYUCvjWp7)7)IM)bz5H;INdclnVE% zk_fNN3eU(8law+)m+Yhh9}i#cjBKtv?~1TM@8ZgIV@u;aS1&J*tWx8&3Rfee9OLA2 zXZOsos)C{{ZxfRu-)wZ-O#MgFUlLBD9NrqfDGj5+i)V3$qN;ohm&t@}k_! zvrKdJb21#A42!Egb6vSYLQIoW@=B@_i#5iP%GWlkEJ@F;$g40a^em_<$_%q`$u3PVj&wIluhMtQND20; zbW15M2@d2k3@q|7v4}L$E^#V0&UW&Sa1D3#OHYmn^)U%F2=}PSEUWTJ4++jl4m3fx z%{#2fqNrRU%&Rce#KO-@-?>=Z*V(|t$R#(kFx17>wID+~E7jOD-Lfnqv^c%g*xi>a zD99|r!_+UYswz)kJ2JxCwAj+!OWQ5d%rnE?(A7N9$lSchsLVXCJSPy{wzSMd!_+_p zzX<)bs)EAY{7?(iaFZkx-zxvaw6u~uXV<98M7P9JS8Wr&phVLEM}tr<@6yWj!Z5?a zVpHP)-;^L1Q;Wcoe1Cm|Qn#Qm(_C*C7mJi~Cv5`{_fm{B=~?CITj;2eSR7?gR+%4~ zW9;gbX=!fepQ|0{=9(F75|(9T5LJQrBPK*#_0;h=^p7B-q{6ap`PWX;ejdP z8IdNDuKHmm0TxD4WvTh8Mv;+WF69QUPJvueKJNM@9^pY{+TK}J1_1^x{w0Z(Zss|D z{%#@KS-!bZ$!0~`l@(dxk@@H$>5*iRSrDj@9qH}sk{RY}=#rFLl>>^!AfwzAC*QP+ zLf-=Oih?BLH1|NCLj7VR6Rtpyh_qt;0ACMBulyW~%3%Hc0JoBm5c3@UyyP^C;z$e6 z$ZU_YJywZS6S65ddr6k46KeZ^QG(0)U ztEHHih zJ;CdbfYO2RU2&J#HHwxm6YEQIdNg&1z_DE$-sswYefs3ZHU|;SE1!S=yHWjd<7?A{ zZj$~pO9kuNTxK8p?>1fAHSWZ=+vd_<; zBF$0HMdD%Rln-}W%Rkh~Xx!B+2(CSuIYYAU*o#gc!-hjgRp)%Jb!l9@PP}pZ&z+?~ kuQlRYLfQ@8cbzz5f1^dz--$u{*lLw6)7GkgJO6Jg02%-`p8x;= literal 1637 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5yV>s`M>) zG)ngkakH#Q3QOD;1A%H}GrtSm7rk90SUFstwm zH!CdgFLE}{uQW~x^)w1`_BSyI)Hd_T$SJnWOh>oPB%mrPKV3mP&?hM+Jv_0}*`mm? zA|=G!D90kx*VVt+(=(;qrJ%~)JE^e9Jj&0pGMURI!aY62F~u=4B{aAsJT*Viz&Fgo zz&p#(+04ScAl==-xhTBCs35Z3-51@q6i0)ypmc@O>;RuYUrSRXBbVY7&s4+IsA5ys z#L~2KAAhGpFLx7XmtxoS(1=Wb4_~e-r@)}xz>0{%usq+quuSiaqAYXoyquJ*azFok zmnt7WZ{PCru)J)aEDXPy`lVPJmn)QKrR9WXdFQ8S8-!>V<+^5tRd|QHBzuSZS7v*Z z`MBiyxjC8z6dISi6?5gKmxXwlr-UVzW*1vJ`sP|%)!8knJk&WPpfJaGtH8GQ#_K44Jysjk{ydoybUt-4b1XN+`XJlEmG1#1G)Tt zvRz%>oQs2fG73XHqe{!Xiu0VaL(Fp0%&QDDliefz$}K&OOOkRb4A5;$%S<#(4ODOn zFe)j_cP%b)FE(^^N-YgDNcRcO%5}=i2r5e}DK?HuG7s}NFwRL#cjYoK&n~nK@sDsS zHngw^@=tcFs&We|_p2}u_Hqm;_VLS3PPR-mwWvr+!U##vDo5W!M+NOD{ZQwm?9vR& z!l;0Jb8jQJl2o7Ubm#0M&w%{&;=J@!qp+-OgW|#pM=rmV(5jH&vWmc@LQ8|p9Fyck zL&xNh+`O_}Lw83Lx4;Uc2#??(_mJE`S1z>tRvK01WSp*$7ZF}*oMVy`9*`6k9AZ{c z5}X=n8D&{g8d>RHP?(!!5aFX8>7AYD?h?pV>ZP6T>YZg8njYyC5K*30pzT#$Y2p!* zXIP*e?o*KC5mc3Ks-ITnlV*W#n@5sCWXkcJsUbcBrdS)?KURJ2Tk)^v|L}s#2epo?KqHj=XX+>UCZl0NOsfl-1 zP_k2IVpN%nzad5{freycnxlDDh^wP%N>xOXrL$vIx{HyMWs+sENxq?hMTKXgdtR}2 zUU7DbOEFhOdAPGjMNUaUL|SlJkeQKtqM3zRc!{H_i+6rlZf1_ZuXbKZZf=lgNjbXT zptgl)wKXLC80WQAEc z`Bg-kmU}0bzQM@Hq8g{6A=2I{+4MCR<2LyTNl!R-C zxfHpTo0bRZhdP(}1?T!#lopp{JC&OTdT8rs2fFHqgmQTneyL6HIPyfsQf|^^@g@Zo zq3rK*o|QAs9VwPg$yuHd`0UTlX8sGB^4&{rH`;zO4PJXXDfdDb@QiHMicH@%B3 z_ws)@?I^zYW&JbG&hx7AwGXce0fvH@FU(`=1*W5S%&5Z!Y=RT7*G6jB>c&MKC mY2BQ_pmgS0hjSmq)QC8o`TsQFKx7z)UwxZ}_tUr9%!dJB`#YKd diff --git a/secrets/ldap/pw.age b/secrets/ldap/pw.age index e5deda4..057cdcb 100644 --- a/secrets/ldap/pw.age +++ b/secrets/ldap/pw.age @@ -1,26 +1,27 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA gbttBwmYtq67vkhosksaN3pMFRD+yIZ9c3jkUqLjzwc -sKzCx+fRVT08lE9SROuhsKk4umCokWSafCQtK6NzX3s --> ssh-ed25519 4PzZog 1n6kEJ2pIjIt1u6DUG2P0PL8s8k2316YnPR4cGLgW0I -EFE4bJ9AkJFAITUIMUSVaFszK01rpffnzg2HXLSskFU --> ssh-ed25519 dA0vRg g9Xtgji4q1bjaGGiTqvBW9f/N9D2qZQimo9Wz8aNb10 -zj/0VlNRk3jX054Nu9hZGP+Vpx6YsBtxUTdjOOUyzUc --> ssh-ed25519 5Nd93w xwTEItzkfxNRvwPcncZGqUGeOpY3eSJSYP7vkhWjlmg -sTTlm+WdWTTKfr+KTUVa5nLJAHv8UcsWJDXAuFqFZOY --> ssh-ed25519 q8eJgg Jj02qd+MlAOSGLWEsaosZtfo3f0zZyzdT0czSauQr3I -aKHrwFMt4KvICBXm4fdt57ZaaGkilv1Eau7Y6TPB3ls --> ssh-ed25519 KVr8rw DKp/IrXZ3Cqh7b7coO22iDR/InZ5xY8iLcm1KFgUCSI -YUQJ05y952NIoUeChUDcuvO9ku6S7qoBafRwSmCzLUk --> ssh-ed25519 fia1eQ w1p/K436VeeWLjTtxZAGeOl0oZWeE88C2OfAg4Vc6Vg -eLcoL3kV2fhtZREEmgIEiX6ci05tU4PypX+WrRaoC4w --> ssh-ed25519 IzAMqA ItqYQQFlBcabTg8ydW0EEq9ZO7SamcZUGCtZUCAtSmo -RvtyYRdWEmMhU6uA8WSFhuzow8CsXWZmyJR9m+CDo/g --> ssh-ed25519 uZzB3g gG0Ku+k9Ct8D7ZuHPsD9IZO0+O36jKps6QDYEyhYSy0 -4npr5UCPapsWmyANaX08JVVCmU3mpgD93kGWvEFP4F4 --> ssh-ed25519 Hb0ipQ jO43lRL6JA0dLRfei2uR4xo7b+hKItvQmYEjauLEvkU -3RuQqq+Z6V0qASF1EhtiDhn5MZ65sdmJ8hzebRmAlK8 --> ssh-ed25519 IzAMqA 8q3O2zg4eX41Gbh8PSVTxy6ukc28PVvoIROkbKcJqV4 -bnS9VskRrWKZR0KDsh8elU4vhBXuZKV+7sj4Mx8QuXw ---- 3yQiKJMfU9JyNxvcZLea+2FlHsoGWpaAeKQvMLE87uQ -ӪvK #\Q';—Wy:%8]^|>JMF+!Z2<@26S?` C\˘ńKÌbWɞJӄ1' In%A;ۑ@9L3aYMI`n;tr:.Pя - \ No newline at end of file +-> ssh-ed25519 V1pwNA U0WP4K92oRNJ1Dz7siaR+8IcCuKO+diy9VhnuyMQ3w8 +Ral58VncypJzKyBweTNDn0uyFfmqbVBsZAgsxd16I8s +-> ssh-ed25519 4PzZog ADJzfpJ3mw+42CriE25RkMq49zMrkaQM+mYO450fDBo +lkz7JlpkgOOg/clVAOJ3BBnSmo84u+hxHAqxgj4VfgQ +-> ssh-ed25519 dA0vRg TbBXDcY0qSdQ8X+CsumrUV8DATgyjybFmMSr7vKcvEQ +VA0TrtKta0ObYcXio/usanpsD/cAtS/FSd6IcOLYzaQ +-> ssh-ed25519 5Nd93w dFpBpeouKn6S84QDP3mvQmecCnGO1DbEFRf4IgnsHjc +9xoxDilLBwS1QxXnXk2CUaoyQs8udAZJqbgwMpj5ivI +-> ssh-ed25519 q8eJgg 7bSXg/HPIYoAMK/aLs+IrN9Y9BEPUyTsIo3PLEmH4yk +l0Pe13zucVpLKDE9LnBtQMkdQQuAbR/hCYhjmji6xHo +-> ssh-ed25519 KVr8rw cDXOR2vdFmc8V0cDFzJd+7024ez99Th7v+i/7aK6Zwg +av5jiCaB5Q4Pa6Jbmeyx7RFwrj/qkmIN+BC7d8IMP+g +-> ssh-ed25519 fia1eQ 1VFDFHIJ58+ybs3uUVIXHMpOCweDRBH1h/9b/qfUc1Y +W74hrPdMJ8sriTxN7FMoGkY22Ba3uq8DB+H1Rb4AGII +-> ssh-ed25519 IzAMqA pIdk0fdfM7FZB/TTA9EN38qzBxVO1IMgDSi03tpJR3s +f4UURtxj2/YnmepYeoiFeSVwsWo4u/YYZzPZr+vybVY +-> ssh-ed25519 uZzB3g JhwS814323gjfUA4JxkPFuBfNppmI5N4sN2bLxOXTVY +Up6477aZtVmbVV0s+dAafQZm1Fk4L3zA5nGG/JOMnX8 +-> ssh-ed25519 Hb0ipQ 7eBD6LAaLzBep1Ihw5ElMkeT8lYTeaQJGoYlsN6AVm8 +9QLQ1Uja0PfiQdpnB4ykW8GAXdzDZUfertdRB1V/+/Q +-> ssh-ed25519 IzAMqA TPkc8WaH/jYOcTvFD43lwQR6fgnJ9bLdMJI5ns49hX0 +FoUbMUqIfkiFxk8YqwHmeVb5/k7H+0EJcFDzNZoPs8s +--- Rfu7lKgz3e8yBtCwf1rlh2lH5pMTtBeCAR2HtL8Lehw +X_bp9e +K۬Op + 8putJ[W:Q +\SWzu3Ȑc&`JTXݒRK8ͳu8[SK`[3?hT7atL1|H`nۡ;i2 \ No newline at end of file diff --git a/secrets/nextcloud/pw.age b/secrets/nextcloud/pw.age index 02fdf3fc198303e2ea6417601ecf49e25c2f48f7..1e381170f4ea55290d3993a2b167a7b92b09066d 100644 GIT binary patch delta 936 zcmZqRXyBNjQ=e!SU|5=5lpCB}>Qhw} z$faK#VB%x$r|lG$7El!E9ch}I;S^rvmhR&2m0p=q;_YW>>E$0$fawiP+Xj$ zo0?)|YHDbyU=mOjm7lIqVc~0%>1UAa>m2E75oTPT<(A_T78z<59Bf{sou3+LQ0V26 zm2c)}Q5KQRRi2Skq8(Wk>YQAXAMWCkZt7xaQsro9no%6?=u==>T$Wkt7!Z--VX5yq z@uNgoR#uc*h=)&pVVX->QAA;6MnQUNQF@TKNm_7aq(w+hg-c;Zrlr1XXe5_*aezy* zZ=SiAkw=L|qM4ItdX;%pS$d#Tlv`kcw?T$wrm0bCRg$5ff$!vaM)B}KmsHa#r}E0w zyp%HiBCnw297}DBuwv&(w~XL4Z6D*RoS@{8%%XH7cUP{!%81ZR=K!B_3sXPOsE{nn zoT`u#Poq*N^PpTem;6M_66df&&+y1l3&+W48O7_1^ed9mTmzHJqdc_>aAJkQ*zEYmVkJ1Q$YvA)Q_AkV)dFDu(9 z*r>|Wr!p_q!#v0>&^#-dtI$8q)GRI3ye!lwwK6a%H^?&I*vQ|k$knJI&#BP7I4L{X z*(p0L%BRc#-MX~QM8niT1;^C#OivGgH^*{!<5K-V_eggir>fwzBzKpLV)MYrq@v3D zqMS%W3j^mc3oheS=PKXIpdbUIe2d_`$jUGeKR1u0ywXVR^rDI3&^nLWx$~=q0ywd~Cz5S9RGP6s9+`NpVqEey^bF!n# zeYpxt^|MP#GU~nj+}w@yqs)sv4T{Yx1Dy*i^sBO}QbO~6Le2eB@(e??Ez-Gkb#)aI zUEKpygHwEy+|1KVO3bT*9V0w_^aH{Ti^9u&5?#}b%iR1-G75`*^ewo;PfN?L(dMXc zWH|Tbyyf<)NBX)g>qAd}TX|j9UcNupEjr%t?`yl~OIKe~;5Prg=aSCXwAM7?uN5y^ W4`*$WJrH|krqM~$?nITxKNSFaK|U`4 delta 936 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 From 6e496b48678ca45b930e073030b8bfedd9a64ef4 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 3 Apr 2025 14:41:44 +0100 Subject: [PATCH 033/107] feat: results of EGM, Hans is now core, Lorcan is now also core --- config/users.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/users.nix b/config/users.nix index fe8063a..f7c3f84 100644 --- a/config/users.nix +++ b/config/users.nix @@ -55,10 +55,11 @@ in { "silver" "eoghanconlon73" "nanda" + "skyapples" + "generically" ] # Committee - OCM ++ [ - "skyapples" "eliza" "amymucko" "archiedms" From 07b6e478ccda8d43f701847d409c361e8db2217b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 3 Apr 2025 22:32:32 +0100 Subject: [PATCH 034/107] feat: slight reworks and added the 2006 site --- applications/skynet.ie/old_site.nix | 26 ++++- applications/skynet.ie/skynet.ie.nix | 19 +++- applications/skynet.ie/wiki.nix | 5 - flake.lock | 139 ++++++++++++++++++++------- flake.nix | 3 + 5 files changed, 144 insertions(+), 48 deletions(-) diff --git a/applications/skynet.ie/old_site.nix b/applications/skynet.ie/old_site.nix index 1e43255..18f80df 100644 --- a/applications/skynet.ie/old_site.nix +++ b/applications/skynet.ie/old_site.nix @@ -9,10 +9,6 @@ with lib; { imports = []; config = { - services.skynet.acme.domains = [ - "${year}.skynet.ie" - ]; - services.skynet.dns.records = [ { record = year; @@ -27,6 +23,28 @@ with lib; { forceSSL = true; useACMEHost = "skynet"; root = "${inputs."skynet_website_${year}".defaultPackage."x86_64-linux"}"; + # Handle any of the old php sites + # https://stackoverflow.com/a/21911610 + locations = { + "/" = { + index = "index.html index.htm index.php"; + tryFiles = "$uri $uri.html $uri/ @extensionless-php"; + }; + + "~ \\.php$" = { + extraConfig = '' + fastcgi_pass unix:${config.services.phpfpm.pools.old_sites.socket}; + fastcgi_index index.php; + ''; + tryFiles = "$uri =404"; + }; + + "@extensionless-php" = { + extraConfig = '' + rewrite ^(.*)$ $1.php last; + ''; + }; + }; }; }; }; diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix index 5082080..147174d 100644 --- a/applications/skynet.ie/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -15,6 +15,7 @@ in { (import ./old_site.nix {year = "2023";}) (import ./old_site.nix {year = "2017";}) (import ./old_site.nix {year = "2009";}) + (import ./old_site.nix {year = "2006";}) ]; options.services.skynet."${name}" = { @@ -23,10 +24,8 @@ in { config = mkIf cfg.enable { services.skynet.acme.domains = [ - "www.skynet.ie" - "discord.skynet.ie" + "*.skynet.ie" "*.discord.skynet.ie" - "public.skynet.ie" ]; services.skynet.dns.records = [ @@ -103,5 +102,19 @@ in { }; }; }; + + # Some old sites need a php pool running + services.phpfpm.pools.old_sites = { + user = "nobody"; + settings = { + "pm" = "dynamic"; + "listen.owner" = config.services.nginx.user; + "pm.max_children" = 5; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 1; + "pm.max_spare_servers" = 3; + "pm.max_requests" = 500; + }; + }; }; } diff --git a/applications/skynet.ie/wiki.nix b/applications/skynet.ie/wiki.nix index 6d1aa57..19250b3 100644 --- a/applications/skynet.ie/wiki.nix +++ b/applications/skynet.ie/wiki.nix @@ -17,11 +17,6 @@ in { }; config = mkIf cfg.enable { - services.skynet.acme.domains = [ - "renew.skynet.ie" - "wiki.skynet.ie" - ]; - services.skynet.dns.records = [ { record = "renew"; diff --git a/flake.lock b/flake.lock index ce99479..4a4262b 100644 --- a/flake.lock +++ b/flake.lock @@ -47,7 +47,7 @@ "inputs": { "fenix": "fenix_2", "flakeCompat": "flakeCompat_2", - "nixpkgs": "nixpkgs_18" + "nixpkgs": "nixpkgs_19" }, "locked": { "lastModified": 1719514321, @@ -632,11 +632,11 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1690026219, - "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", "type": "github" }, "original": { @@ -646,11 +646,11 @@ }, "nixpkgs_15": { "locked": { - "lastModified": 1689935543, - "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "lastModified": 1690026219, + "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", "type": "github" }, "original": { @@ -673,6 +673,20 @@ } }, "nixpkgs_17": { + "locked": { + "lastModified": 1689935543, + "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_18": { "locked": { "lastModified": 1695978539, "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", @@ -686,7 +700,7 @@ "type": "indirect" } }, - "nixpkgs_18": { + "nixpkgs_19": { "locked": { "lastModified": 1668226844, "narHash": "sha256-G/S4FBWDAqHeBS/hfXwUCJbnaKnrQFoeeKwzvZEOgxM=", @@ -702,20 +716,6 @@ "type": "github" } }, - "nixpkgs_19": { - "locked": { - "lastModified": 1724395761, - "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1733212471, @@ -732,6 +732,20 @@ "type": "github" } }, + "nixpkgs_20": { + "locked": { + "lastModified": 1724395761, + "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nixpkgs_3": { "locked": { "lastModified": 1734119587, @@ -849,6 +863,7 @@ "skynet_ldap_backend": "skynet_ldap_backend", "skynet_ldap_frontend": "skynet_ldap_frontend", "skynet_website": "skynet_website", + "skynet_website_2006": "skynet_website_2006", "skynet_website_2009": "skynet_website_2009", "skynet_website_2017": "skynet_website_2017", "skynet_website_2023": "skynet_website_2023", @@ -992,11 +1007,30 @@ "url": "https://forgejo.skynet.ie/Skynet/website_2017" } }, - "skynet_website_2009": { + "skynet_website_2006": { "inputs": { "nixpkgs": "nixpkgs_14", "utils": "utils_7" }, + "locked": { + "lastModified": 1743715699, + "narHash": "sha256-BgXlk7bT9q+cOE9u74ZfmqxxW0zIHZ/ebLyldO682Zg=", + "ref": "refs/heads/main", + "rev": "616040e0e7636c1e33a06262cc20fb1bf1fb61b6", + "revCount": 15, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2006" + }, + "original": { + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2006" + } + }, + "skynet_website_2009": { + "inputs": { + "nixpkgs": "nixpkgs_15", + "utils": "utils_8" + }, "locked": { "lastModified": 1732375097, "narHash": "sha256-LthEi+y3a+i/VNLBlQZ1v9nkffgJMykMjonFtTt8Yxg=", @@ -1013,8 +1047,8 @@ }, "skynet_website_2017": { "inputs": { - "nixpkgs": "nixpkgs_15", - "utils": "utils_8" + "nixpkgs": "nixpkgs_16", + "utils": "utils_9" }, "locked": { "lastModified": 1689960297, @@ -1032,8 +1066,8 @@ }, "skynet_website_2023": { "inputs": { - "nixpkgs": "nixpkgs_16", - "utils": "utils_9" + "nixpkgs": "nixpkgs_17", + "utils": "utils_10" }, "locked": { "lastModified": 1696876711, @@ -1051,8 +1085,8 @@ }, "skynet_website_games": { "inputs": { - "nixpkgs": "nixpkgs_17", - "utils": "utils_10" + "nixpkgs": "nixpkgs_18", + "utils": "utils_11" }, "locked": { "lastModified": 1727122069, @@ -1071,8 +1105,8 @@ "skynet_website_wiki": { "inputs": { "alejandra": "alejandra_2", - "nixpkgs": "nixpkgs_19", - "utils": "utils_11" + "nixpkgs": "nixpkgs_20", + "utils": "utils_12" }, "locked": { "lastModified": 1739580335, @@ -1194,6 +1228,21 @@ "type": "github" } }, + "systems_15": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1336,6 +1385,24 @@ "inputs": { "systems": "systems_13" }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_11": { + "inputs": { + "systems": "systems_14" + }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", @@ -1350,9 +1417,9 @@ "type": "github" } }, - "utils_11": { + "utils_12": { "inputs": { - "systems": "systems_14" + "systems": "systems_15" }, "locked": { "lastModified": 1710146030, @@ -1463,11 +1530,11 @@ "systems": "systems_10" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2d96432..2554929 100644 --- a/flake.nix +++ b/flake.nix @@ -58,6 +58,9 @@ # this is more of 2012 than 2009 but started in 2009 skynet_website_2009.url = "git+https://forgejo.skynet.ie/Skynet/website_2009"; + + # these are from a snapshot archive + skynet_website_2006.url = "git+https://forgejo.skynet.ie/Skynet/website_2006"; }; nixConfig = { From 8f47404b0e7cc22b6a04043605867c624ab0f53d Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 3 Apr 2025 23:28:38 +0100 Subject: [PATCH 035/107] =?UTF-8?q?feat:=20added=20the=202003=20website,?= =?UTF-8?q?=20recovered=20by=20Lorc=C3=A1n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/skynet.ie/skynet.ie.nix | 1 + flake.lock | 145 ++++++++++++++++++++------- flake.nix | 1 + 3 files changed, 108 insertions(+), 39 deletions(-) diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix index 147174d..3e1ffb5 100644 --- a/applications/skynet.ie/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -16,6 +16,7 @@ in { (import ./old_site.nix {year = "2017";}) (import ./old_site.nix {year = "2009";}) (import ./old_site.nix {year = "2006";}) + (import ./old_site.nix {year = "2003";}) ]; options.services.skynet."${name}" = { diff --git a/flake.lock b/flake.lock index 4a4262b..8db4d9b 100644 --- a/flake.lock +++ b/flake.lock @@ -47,7 +47,7 @@ "inputs": { "fenix": "fenix_2", "flakeCompat": "flakeCompat_2", - "nixpkgs": "nixpkgs_19" + "nixpkgs": "nixpkgs_20" }, "locked": { "lastModified": 1719514321, @@ -646,11 +646,11 @@ }, "nixpkgs_15": { "locked": { - "lastModified": 1690026219, - "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", "type": "github" }, "original": { @@ -660,11 +660,11 @@ }, "nixpkgs_16": { "locked": { - "lastModified": 1689935543, - "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "lastModified": 1690026219, + "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", "type": "github" }, "original": { @@ -687,6 +687,20 @@ } }, "nixpkgs_18": { + "locked": { + "lastModified": 1689935543, + "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_19": { "locked": { "lastModified": 1695978539, "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", @@ -700,22 +714,6 @@ "type": "indirect" } }, - "nixpkgs_19": { - "locked": { - "lastModified": 1668226844, - "narHash": "sha256-G/S4FBWDAqHeBS/hfXwUCJbnaKnrQFoeeKwzvZEOgxM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "dd4767bf613bf9553eee6ff37c0996b9c876e7d8", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1733212471, @@ -733,6 +731,22 @@ } }, "nixpkgs_20": { + "locked": { + "lastModified": 1668226844, + "narHash": "sha256-G/S4FBWDAqHeBS/hfXwUCJbnaKnrQFoeeKwzvZEOgxM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "dd4767bf613bf9553eee6ff37c0996b9c876e7d8", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_21": { "locked": { "lastModified": 1724395761, "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", @@ -863,6 +877,7 @@ "skynet_ldap_backend": "skynet_ldap_backend", "skynet_ldap_frontend": "skynet_ldap_frontend", "skynet_website": "skynet_website", + "skynet_website_2003": "skynet_website_2003", "skynet_website_2006": "skynet_website_2006", "skynet_website_2009": "skynet_website_2009", "skynet_website_2017": "skynet_website_2017", @@ -1007,11 +1022,30 @@ "url": "https://forgejo.skynet.ie/Skynet/website_2017" } }, - "skynet_website_2006": { + "skynet_website_2003": { "inputs": { "nixpkgs": "nixpkgs_14", "utils": "utils_7" }, + "locked": { + "lastModified": 1743701395, + "narHash": "sha256-5QNUdhjPIP55WIdzEmYHMryMxs3msmfB1z0X502GSPU=", + "ref": "refs/heads/main", + "rev": "e3774b2c7a75b838a0cd6424ce0e0e9a41c443c4", + "revCount": 10, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2003" + }, + "original": { + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2003" + } + }, + "skynet_website_2006": { + "inputs": { + "nixpkgs": "nixpkgs_15", + "utils": "utils_8" + }, "locked": { "lastModified": 1743715699, "narHash": "sha256-BgXlk7bT9q+cOE9u74ZfmqxxW0zIHZ/ebLyldO682Zg=", @@ -1028,8 +1062,8 @@ }, "skynet_website_2009": { "inputs": { - "nixpkgs": "nixpkgs_15", - "utils": "utils_8" + "nixpkgs": "nixpkgs_16", + "utils": "utils_9" }, "locked": { "lastModified": 1732375097, @@ -1047,8 +1081,8 @@ }, "skynet_website_2017": { "inputs": { - "nixpkgs": "nixpkgs_16", - "utils": "utils_9" + "nixpkgs": "nixpkgs_17", + "utils": "utils_10" }, "locked": { "lastModified": 1689960297, @@ -1066,8 +1100,8 @@ }, "skynet_website_2023": { "inputs": { - "nixpkgs": "nixpkgs_17", - "utils": "utils_10" + "nixpkgs": "nixpkgs_18", + "utils": "utils_11" }, "locked": { "lastModified": 1696876711, @@ -1085,8 +1119,8 @@ }, "skynet_website_games": { "inputs": { - "nixpkgs": "nixpkgs_18", - "utils": "utils_11" + "nixpkgs": "nixpkgs_19", + "utils": "utils_12" }, "locked": { "lastModified": 1727122069, @@ -1105,8 +1139,8 @@ "skynet_website_wiki": { "inputs": { "alejandra": "alejandra_2", - "nixpkgs": "nixpkgs_20", - "utils": "utils_12" + "nixpkgs": "nixpkgs_21", + "utils": "utils_13" }, "locked": { "lastModified": 1739580335, @@ -1243,6 +1277,21 @@ "type": "github" } }, + "systems_16": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1403,6 +1452,24 @@ "inputs": { "systems": "systems_14" }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_12": { + "inputs": { + "systems": "systems_15" + }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", @@ -1417,9 +1484,9 @@ "type": "github" } }, - "utils_12": { + "utils_13": { "inputs": { - "systems": "systems_15" + "systems": "systems_16" }, "locked": { "lastModified": 1710146030, @@ -1548,11 +1615,11 @@ "systems": "systems_11" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2554929..778558c 100644 --- a/flake.nix +++ b/flake.nix @@ -61,6 +61,7 @@ # these are from a snapshot archive skynet_website_2006.url = "git+https://forgejo.skynet.ie/Skynet/website_2006"; + skynet_website_2003.url = "git+https://forgejo.skynet.ie/Skynet/website_2003"; }; nixConfig = { From f668dc0d5590df70e1d2ecdd816c568997ee265e Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Thu, 3 Apr 2025 23:07:57 +0000 Subject: [PATCH 036/107] Updated flake for skynet_website_2003 --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 8db4d9b..4ee5719 100644 --- a/flake.lock +++ b/flake.lock @@ -1028,11 +1028,11 @@ "utils": "utils_7" }, "locked": { - "lastModified": 1743701395, - "narHash": "sha256-5QNUdhjPIP55WIdzEmYHMryMxs3msmfB1z0X502GSPU=", + "lastModified": 1743721206, + "narHash": "sha256-n9JGscEsckoasfmvpWKJ0kifQp1KPw8MbWPHhmmkLCU=", "ref": "refs/heads/main", - "rev": "e3774b2c7a75b838a0cd6424ce0e0e9a41c443c4", - "revCount": 10, + "rev": "855b4c7139caeb3c520d75c9a02393f74fdb3be1", + "revCount": 14, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2003" }, From a89f8144211b3fc3814e070cd0e9f84a2fa9c607 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 4 Apr 2025 00:26:58 +0100 Subject: [PATCH 037/107] feat: properly set the 2016 site as 2016 --- applications/skynet.ie/skynet.ie.nix | 2 +- flake.lock | 16 ++++++++-------- flake.nix | 5 +---- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix index 3e1ffb5..6fcf74e 100644 --- a/applications/skynet.ie/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -14,7 +14,7 @@ in { # at teh end of teh year add it here (import ./old_site.nix {year = "2023";}) (import ./old_site.nix {year = "2017";}) - (import ./old_site.nix {year = "2009";}) + (import ./old_site.nix {year = "2016";}) (import ./old_site.nix {year = "2006";}) (import ./old_site.nix {year = "2003";}) ]; diff --git a/flake.lock b/flake.lock index 4ee5719..8737553 100644 --- a/flake.lock +++ b/flake.lock @@ -879,7 +879,7 @@ "skynet_website": "skynet_website", "skynet_website_2003": "skynet_website_2003", "skynet_website_2006": "skynet_website_2006", - "skynet_website_2009": "skynet_website_2009", + "skynet_website_2016": "skynet_website_2016", "skynet_website_2017": "skynet_website_2017", "skynet_website_2023": "skynet_website_2023", "skynet_website_games": "skynet_website_games", @@ -1060,23 +1060,23 @@ "url": "https://forgejo.skynet.ie/Skynet/website_2006" } }, - "skynet_website_2009": { + "skynet_website_2016": { "inputs": { "nixpkgs": "nixpkgs_16", "utils": "utils_9" }, "locked": { - "lastModified": 1732375097, - "narHash": "sha256-LthEi+y3a+i/VNLBlQZ1v9nkffgJMykMjonFtTt8Yxg=", + "lastModified": 1743722645, + "narHash": "sha256-uelPrPuv/Z3i4NZ01BlbAqmpB4IlA6zaFL4DlaDWHuo=", "ref": "refs/heads/main", - "rev": "42a1ca5c83a6c21c734d4cc10eec2b06ae25f7ec", - "revCount": 16, + "rev": "316da6b20fe26a6c4c751e74ee214a23265a8205", + "revCount": 18, "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2009" + "url": "https://forgejo.skynet.ie/Skynet/website_2016" }, "original": { "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2009" + "url": "https://forgejo.skynet.ie/Skynet/website_2016" } }, "skynet_website_2017": { diff --git a/flake.nix b/flake.nix index 778558c..d26ce5c 100644 --- a/flake.nix +++ b/flake.nix @@ -56,10 +56,7 @@ # this is not 100% right since this is from teh archive from 2022 or so skynet_website_2017.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99"; - # this is more of 2012 than 2009 but started in 2009 - skynet_website_2009.url = "git+https://forgejo.skynet.ie/Skynet/website_2009"; - - # these are from a snapshot archive + skynet_website_2016.url = "git+https://forgejo.skynet.ie/Skynet/website_2016"; skynet_website_2006.url = "git+https://forgejo.skynet.ie/Skynet/website_2006"; skynet_website_2003.url = "git+https://forgejo.skynet.ie/Skynet/website_2003"; }; From 6bf65a55d78d20a84b234e8f15206d4cabbcc931 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 4 Apr 2025 00:36:38 +0100 Subject: [PATCH 038/107] fix: properly got teh start date of teh new website --- applications/skynet.ie/skynet.ie.nix | 2 +- flake.lock | 16 ++++++++-------- flake.nix | 9 ++++----- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix index 6fcf74e..a73b695 100644 --- a/applications/skynet.ie/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -13,7 +13,7 @@ in { # import in past website versions, available at $year.skynet.ie # at teh end of teh year add it here (import ./old_site.nix {year = "2023";}) - (import ./old_site.nix {year = "2017";}) + (import ./old_site.nix {year = "2021";}) (import ./old_site.nix {year = "2016";}) (import ./old_site.nix {year = "2006";}) (import ./old_site.nix {year = "2003";}) diff --git a/flake.lock b/flake.lock index 8737553..e0c3973 100644 --- a/flake.lock +++ b/flake.lock @@ -880,7 +880,7 @@ "skynet_website_2003": "skynet_website_2003", "skynet_website_2006": "skynet_website_2006", "skynet_website_2016": "skynet_website_2016", - "skynet_website_2017": "skynet_website_2017", + "skynet_website_2021": "skynet_website_2021", "skynet_website_2023": "skynet_website_2023", "skynet_website_games": "skynet_website_games", "skynet_website_wiki": "skynet_website_wiki" @@ -1015,11 +1015,11 @@ "rev": "8987e33cb709e7f2c30017e77edf9161b87d9885", "revCount": 29, "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "url": "https://forgejo.skynet.ie/Skynet/website_2021" }, "original": { "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "url": "https://forgejo.skynet.ie/Skynet/website_2021" } }, "skynet_website_2003": { @@ -1079,7 +1079,7 @@ "url": "https://forgejo.skynet.ie/Skynet/website_2016" } }, - "skynet_website_2017": { + "skynet_website_2021": { "inputs": { "nixpkgs": "nixpkgs_17", "utils": "utils_10" @@ -1090,12 +1090,12 @@ "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", "revCount": 6, "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "url": "https://forgejo.skynet.ie/Skynet/website_2021" }, "original": { "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "url": "https://forgejo.skynet.ie/Skynet/website_2021" } }, "skynet_website_2023": { @@ -1109,12 +1109,12 @@ "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", "revCount": 12, "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "url": "https://forgejo.skynet.ie/Skynet/website_2021" }, "original": { "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "url": "https://forgejo.skynet.ie/Skynet/website_2021" } }, "skynet_website_games": { diff --git a/flake.nix b/flake.nix index d26ce5c..c28a21a 100644 --- a/flake.nix +++ b/flake.nix @@ -49,12 +49,11 @@ ################# # this should always point to teh current website - skynet_website.url = "git+https://forgejo.skynet.ie/Skynet/website_2017"; + skynet_website.url = "git+https://forgejo.skynet.ie/Skynet/website_2021"; - # these are past versions of teh website - skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=c4d61c753292bf73ed41b47b1607cfc92a82a191"; - # this is not 100% right since this is from teh archive from 2022 or so - skynet_website_2017.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99"; + # past versions of the current website + skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?rev=c4d61c753292bf73ed41b47b1607cfc92a82a191"; + skynet_website_2021.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99"; skynet_website_2016.url = "git+https://forgejo.skynet.ie/Skynet/website_2016"; skynet_website_2006.url = "git+https://forgejo.skynet.ie/Skynet/website_2006"; From c57b7679418484a71206a1068f77c502bdf526b2 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 4 Apr 2025 00:46:33 +0100 Subject: [PATCH 039/107] ci: have had issues with websites not being updated properly in nixos --- .forgejo/workflows/update_websites.yaml | 39 +++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .forgejo/workflows/update_websites.yaml diff --git a/.forgejo/workflows/update_websites.yaml b/.forgejo/workflows/update_websites.yaml new file mode 100644 index 0000000..e517f25 --- /dev/null +++ b/.forgejo/workflows/update_websites.yaml @@ -0,0 +1,39 @@ +# The websites can sometimes cause issues when being built and deployed +# This pipeline is to update the inputs from the server + +name: Update_Flake_Websites + +run-name: "[Update Flake Websites]" + +on: + workflow_dispatch: + +jobs: + update: + runs-on: nix + + permissions: + # Give the default GITHUB_TOKEN write permission to commit and push the + # added or changed files to the repository. + contents: write + + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.head_ref }} + token: ${{ secrets.PIPELINE_TOKEN }} + - run: nix flake update skynet_website_2003 + shell: bash + - run: nix flake update skynet_website_2006 + shell: bash + - run: nix flake update skynet_website_2016 + shell: bash + - run: nix flake update skynet_website_2021 + shell: bash + - run: nix flake update skynet_website_2023 + shell: bash + - run: nix flake update skynet_website + shell: bash + - uses: https://github.com/stefanzweifel/git-auto-commit-action@v5 + with: + commit_message: "Updated flake for Websites" \ No newline at end of file From b943e5ec0d823f7e086cb2803c08043728df62a1 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 4 Apr 2025 00:58:37 +0100 Subject: [PATCH 040/107] fix: some errors with teh websites also add 2024 snapshot --- .forgejo/workflows/update_websites.yaml | 2 ++ applications/skynet.ie/skynet.ie.nix | 1 + flake.lock | 16 ++++++++++------ flake.nix | 5 +++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.forgejo/workflows/update_websites.yaml b/.forgejo/workflows/update_websites.yaml index e517f25..c27629e 100644 --- a/.forgejo/workflows/update_websites.yaml +++ b/.forgejo/workflows/update_websites.yaml @@ -32,6 +32,8 @@ jobs: shell: bash - run: nix flake update skynet_website_2023 shell: bash + - run: nix flake update skynet_website_2024 + shell: bash - run: nix flake update skynet_website shell: bash - uses: https://github.com/stefanzweifel/git-auto-commit-action@v5 diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix index a73b695..98a401a 100644 --- a/applications/skynet.ie/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -12,6 +12,7 @@ in { imports = [ # import in past website versions, available at $year.skynet.ie # at teh end of teh year add it here + (import ./old_site.nix {year = "2024";}) (import ./old_site.nix {year = "2023";}) (import ./old_site.nix {year = "2021";}) (import ./old_site.nix {year = "2016";}) diff --git a/flake.lock b/flake.lock index e0c3973..ced0274 100644 --- a/flake.lock +++ b/flake.lock @@ -674,11 +674,11 @@ }, "nixpkgs_17": { "locked": { - "lastModified": 1689935543, - "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "lastModified": 1724114134, + "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "rev": "f02fa2f654c7bcc45f0e815c29d093da7f1245b4", "type": "github" }, "original": { @@ -1087,12 +1087,14 @@ "locked": { "lastModified": 1689960297, "narHash": "sha256-+43nNv4RSQMXMRGdN8xVKYs2B13w5FJtefuykYcpywM=", + "ref": "main", "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", "revCount": 6, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2021" }, "original": { + "ref": "main", "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2021" @@ -1106,12 +1108,14 @@ "locked": { "lastModified": 1696876711, "narHash": "sha256-WdZQBLTX6WK8iT7FwvD6sNEefGwtAWmzxZzCvvmDxGo=", + "ref": "main", "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", "revCount": 12, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2021" }, "original": { + "ref": "main", "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2021" @@ -1435,11 +1439,11 @@ "systems": "systems_13" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c28a21a..95f2a0e 100644 --- a/flake.nix +++ b/flake.nix @@ -52,8 +52,9 @@ skynet_website.url = "git+https://forgejo.skynet.ie/Skynet/website_2021"; # past versions of the current website - skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?rev=c4d61c753292bf73ed41b47b1607cfc92a82a191"; - skynet_website_2021.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99"; + skynet_website_2024.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?ref=main&rev=8987e33cb709e7f2c30017e77edf9161b87d9885"; + skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?ref=main&rev=c4d61c753292bf73ed41b47b1607cfc92a82a191"; + skynet_website_2021.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?ref=main&rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99"; skynet_website_2016.url = "git+https://forgejo.skynet.ie/Skynet/website_2016"; skynet_website_2006.url = "git+https://forgejo.skynet.ie/Skynet/website_2006"; From 5143b683e483fd6099aca1e8fe64510898726977 Mon Sep 17 00:00:00 2001 From: silver <+silver@users.noreply.github.com> Date: Thu, 3 Apr 2025 23:59:32 +0000 Subject: [PATCH 041/107] Updated flake for Websites --- flake.lock | 101 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 85 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index ced0274..88a74f1 100644 --- a/flake.lock +++ b/flake.lock @@ -47,7 +47,7 @@ "inputs": { "fenix": "fenix_2", "flakeCompat": "flakeCompat_2", - "nixpkgs": "nixpkgs_20" + "nixpkgs": "nixpkgs_21" }, "locked": { "lastModified": 1719514321, @@ -674,11 +674,11 @@ }, "nixpkgs_17": { "locked": { - "lastModified": 1724114134, - "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", + "lastModified": 1689935543, + "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f02fa2f654c7bcc45f0e815c29d093da7f1245b4", + "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", "type": "github" }, "original": { @@ -702,11 +702,11 @@ }, "nixpkgs_19": { "locked": { - "lastModified": 1695978539, - "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", + "lastModified": 1724114134, + "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd9b686c0168041aea600222be0805a0de6e6ab8", + "rev": "f02fa2f654c7bcc45f0e815c29d093da7f1245b4", "type": "github" }, "original": { @@ -731,6 +731,20 @@ } }, "nixpkgs_20": { + "locked": { + "lastModified": 1695978539, + "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "bd9b686c0168041aea600222be0805a0de6e6ab8", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_21": { "locked": { "lastModified": 1668226844, "narHash": "sha256-G/S4FBWDAqHeBS/hfXwUCJbnaKnrQFoeeKwzvZEOgxM=", @@ -746,7 +760,7 @@ "type": "github" } }, - "nixpkgs_21": { + "nixpkgs_22": { "locked": { "lastModified": 1724395761, "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", @@ -882,6 +896,7 @@ "skynet_website_2016": "skynet_website_2016", "skynet_website_2021": "skynet_website_2021", "skynet_website_2023": "skynet_website_2023", + "skynet_website_2024": "skynet_website_2024", "skynet_website_games": "skynet_website_games", "skynet_website_wiki": "skynet_website_wiki" } @@ -1121,11 +1136,32 @@ "url": "https://forgejo.skynet.ie/Skynet/website_2021" } }, - "skynet_website_games": { + "skynet_website_2024": { "inputs": { "nixpkgs": "nixpkgs_19", "utils": "utils_12" }, + "locked": { + "lastModified": 1732375016, + "narHash": "sha256-Y+bJw85TNOp8N369OV0VrDdm3oDy8CXG+GUuG6pZjbo=", + "ref": "main", + "rev": "8987e33cb709e7f2c30017e77edf9161b87d9885", + "revCount": 29, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2021" + }, + "original": { + "ref": "main", + "rev": "8987e33cb709e7f2c30017e77edf9161b87d9885", + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2021" + } + }, + "skynet_website_games": { + "inputs": { + "nixpkgs": "nixpkgs_20", + "utils": "utils_13" + }, "locked": { "lastModified": 1727122069, "narHash": "sha256-GOPYcXDc+KN6LmxMqobFUOn6e9e0khBW3SrFLj6+2i4=", @@ -1143,8 +1179,8 @@ "skynet_website_wiki": { "inputs": { "alejandra": "alejandra_2", - "nixpkgs": "nixpkgs_21", - "utils": "utils_13" + "nixpkgs": "nixpkgs_22", + "utils": "utils_14" }, "locked": { "lastModified": 1739580335, @@ -1296,6 +1332,21 @@ "type": "github" } }, + "systems_17": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1439,11 +1490,11 @@ "systems": "systems_13" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -1474,6 +1525,24 @@ "inputs": { "systems": "systems_15" }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_13": { + "inputs": { + "systems": "systems_16" + }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", @@ -1488,9 +1557,9 @@ "type": "github" } }, - "utils_13": { + "utils_14": { "inputs": { - "systems": "systems_16" + "systems": "systems_17" }, "locked": { "lastModified": 1710146030, From 5f5e54efd6cc38465eaee4c6acc08c89d6013aed Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 4 Apr 2025 01:44:31 +0100 Subject: [PATCH 042/107] feat: added teh 2022 site --- applications/skynet.ie/skynet.ie.nix | 2 +- flake.lock | 46 ++++++++++++++-------------- flake.nix | 8 ++--- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix index 98a401a..8a625f3 100644 --- a/applications/skynet.ie/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -14,7 +14,7 @@ in { # at teh end of teh year add it here (import ./old_site.nix {year = "2024";}) (import ./old_site.nix {year = "2023";}) - (import ./old_site.nix {year = "2021";}) + (import ./old_site.nix {year = "2022";}) (import ./old_site.nix {year = "2016";}) (import ./old_site.nix {year = "2006";}) (import ./old_site.nix {year = "2003";}) diff --git a/flake.lock b/flake.lock index 88a74f1..65c6161 100644 --- a/flake.lock +++ b/flake.lock @@ -674,11 +674,11 @@ }, "nixpkgs_17": { "locked": { - "lastModified": 1689935543, - "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "lastModified": 1724114134, + "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "rev": "f02fa2f654c7bcc45f0e815c29d093da7f1245b4", "type": "github" }, "original": { @@ -894,7 +894,7 @@ "skynet_website_2003": "skynet_website_2003", "skynet_website_2006": "skynet_website_2006", "skynet_website_2016": "skynet_website_2016", - "skynet_website_2021": "skynet_website_2021", + "skynet_website_2022": "skynet_website_2022", "skynet_website_2023": "skynet_website_2023", "skynet_website_2024": "skynet_website_2024", "skynet_website_games": "skynet_website_games", @@ -1030,11 +1030,11 @@ "rev": "8987e33cb709e7f2c30017e77edf9161b87d9885", "revCount": 29, "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2021" + "url": "https://forgejo.skynet.ie/Skynet/website_2023" }, "original": { "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2021" + "url": "https://forgejo.skynet.ie/Skynet/website_2023" } }, "skynet_website_2003": { @@ -1094,25 +1094,25 @@ "url": "https://forgejo.skynet.ie/Skynet/website_2016" } }, - "skynet_website_2021": { + "skynet_website_2022": { "inputs": { "nixpkgs": "nixpkgs_17", "utils": "utils_10" }, "locked": { - "lastModified": 1689960297, - "narHash": "sha256-+43nNv4RSQMXMRGdN8xVKYs2B13w5FJtefuykYcpywM=", - "ref": "main", - "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", - "revCount": 6, + "lastModified": 1743727062, + "narHash": "sha256-myrgO0BU23zCD+mZnLfjmr/txjCWQizqlR72Hjv+E3s=", + "ref": "2022", + "rev": "687a0b1811987cfc27c2e6f5a625c4d59ef577c2", + "revCount": 30, "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2021" + "url": "https://forgejo.skynet.ie/Skynet/website_2023" }, "original": { - "ref": "main", - "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", + "ref": "2022", + "rev": "687a0b1811987cfc27c2e6f5a625c4d59ef577c2", "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2021" + "url": "https://forgejo.skynet.ie/Skynet/website_2023" } }, "skynet_website_2023": { @@ -1127,13 +1127,13 @@ "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", "revCount": 12, "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2021" + "url": "https://forgejo.skynet.ie/Skynet/website_2023" }, "original": { "ref": "main", "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2021" + "url": "https://forgejo.skynet.ie/Skynet/website_2023" } }, "skynet_website_2024": { @@ -1148,13 +1148,13 @@ "rev": "8987e33cb709e7f2c30017e77edf9161b87d9885", "revCount": 29, "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2021" + "url": "https://forgejo.skynet.ie/Skynet/website_2023" }, "original": { "ref": "main", "rev": "8987e33cb709e7f2c30017e77edf9161b87d9885", "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2021" + "url": "https://forgejo.skynet.ie/Skynet/website_2023" } }, "skynet_website_games": { @@ -1490,11 +1490,11 @@ "systems": "systems_13" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 95f2a0e..5c7dc2b 100644 --- a/flake.nix +++ b/flake.nix @@ -49,12 +49,12 @@ ################# # this should always point to teh current website - skynet_website.url = "git+https://forgejo.skynet.ie/Skynet/website_2021"; + skynet_website.url = "git+https://forgejo.skynet.ie/Skynet/website_2023"; # past versions of the current website - skynet_website_2024.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?ref=main&rev=8987e33cb709e7f2c30017e77edf9161b87d9885"; - skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?ref=main&rev=c4d61c753292bf73ed41b47b1607cfc92a82a191"; - skynet_website_2021.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?ref=main&rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99"; + skynet_website_2024.url = "git+https://forgejo.skynet.ie/Skynet/website_2023?ref=main&rev=8987e33cb709e7f2c30017e77edf9161b87d9885"; + skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2023?ref=main&rev=c4d61c753292bf73ed41b47b1607cfc92a82a191"; + skynet_website_2022.url = "git+https://forgejo.skynet.ie/Skynet/website_2023?ref=2022&rev=687a0b1811987cfc27c2e6f5a625c4d59ef577c2"; skynet_website_2016.url = "git+https://forgejo.skynet.ie/Skynet/website_2016"; skynet_website_2006.url = "git+https://forgejo.skynet.ie/Skynet/website_2006"; From e5554963d1520772c9e855b6e4d08cff531b9e28 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 7 Apr 2025 00:07:38 +0100 Subject: [PATCH 043/107] feat: enable better repo searching --- applications/git/forgejo.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/applications/git/forgejo.nix b/applications/git/forgejo.nix index c7b3572..aa8fd86 100644 --- a/applications/git/forgejo.nix +++ b/applications/git/forgejo.nix @@ -105,6 +105,11 @@ in { DEFAULT_ACTIONS_URL = "github"; }; + indexer = { + # Will consume more disk space, but we have plenty of that + REPO_INDEXER_ENABLED = true; + }; + # Allow for signing off merge requests # "repository.signing" = { # SIGNING_KEY = "5B2DED0FE9F8627A"; From 9059554c586cea4a02215dd9fff0a2c1800f1135 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 7 Apr 2025 23:44:22 +0100 Subject: [PATCH 044/107] feat: re-enable the dns for the nuked server --- config/dns.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/dns.nix b/config/dns.nix index 636dede..ccb1df3 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -38,6 +38,11 @@ value = "193.1.99.86"; server = true; } + { + record = "nuked"; + r_type = "CNAME"; + value = "neuromancer.skynet.ie."; + } ] # non skynet domains ++ [ From cef7588212206d35c6bd3fcaac85fe6c43d24c80 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 7 Apr 2025 23:49:22 +0100 Subject: [PATCH 045/107] feat: got the 1996 site up and running --- applications/skynet.ie/skynet.ie.nix | 1 + flake.lock | 161 +++++++++++++++++++-------- flake.nix | 1 + 3 files changed, 116 insertions(+), 47 deletions(-) diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix index 8a625f3..fb1bf69 100644 --- a/applications/skynet.ie/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -18,6 +18,7 @@ in { (import ./old_site.nix {year = "2016";}) (import ./old_site.nix {year = "2006";}) (import ./old_site.nix {year = "2003";}) + (import ./old_site.nix {year = "1996";}) ]; options.services.skynet."${name}" = { diff --git a/flake.lock b/flake.lock index 65c6161..ee90678 100644 --- a/flake.lock +++ b/flake.lock @@ -47,7 +47,7 @@ "inputs": { "fenix": "fenix_2", "flakeCompat": "flakeCompat_2", - "nixpkgs": "nixpkgs_21" + "nixpkgs": "nixpkgs_22" }, "locked": { "lastModified": 1719514321, @@ -659,6 +659,20 @@ } }, "nixpkgs_16": { + "locked": { + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_17": { "locked": { "lastModified": 1690026219, "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", @@ -672,7 +686,7 @@ "type": "indirect" } }, - "nixpkgs_17": { + "nixpkgs_18": { "locked": { "lastModified": 1724114134, "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", @@ -686,27 +700,13 @@ "type": "indirect" } }, - "nixpkgs_18": { - "locked": { - "lastModified": 1689935543, - "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_19": { "locked": { - "lastModified": 1724114134, - "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", + "lastModified": 1689935543, + "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f02fa2f654c7bcc45f0e815c29d093da7f1245b4", + "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", "type": "github" }, "original": { @@ -731,6 +731,20 @@ } }, "nixpkgs_20": { + "locked": { + "lastModified": 1724114134, + "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f02fa2f654c7bcc45f0e815c29d093da7f1245b4", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_21": { "locked": { "lastModified": 1695978539, "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", @@ -744,7 +758,7 @@ "type": "indirect" } }, - "nixpkgs_21": { + "nixpkgs_22": { "locked": { "lastModified": 1668226844, "narHash": "sha256-G/S4FBWDAqHeBS/hfXwUCJbnaKnrQFoeeKwzvZEOgxM=", @@ -760,7 +774,7 @@ "type": "github" } }, - "nixpkgs_22": { + "nixpkgs_23": { "locked": { "lastModified": 1724395761, "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", @@ -891,6 +905,7 @@ "skynet_ldap_backend": "skynet_ldap_backend", "skynet_ldap_frontend": "skynet_ldap_frontend", "skynet_website": "skynet_website", + "skynet_website_1996": "skynet_website_1996", "skynet_website_2003": "skynet_website_2003", "skynet_website_2006": "skynet_website_2006", "skynet_website_2016": "skynet_website_2016", @@ -1037,11 +1052,30 @@ "url": "https://forgejo.skynet.ie/Skynet/website_2023" } }, - "skynet_website_2003": { + "skynet_website_1996": { "inputs": { "nixpkgs": "nixpkgs_14", "utils": "utils_7" }, + "locked": { + "lastModified": 1744063133, + "narHash": "sha256-MAevnJsxpaimUzJepL2BpbxlbRVCq3l9G990+LxNKEY=", + "ref": "refs/heads/main", + "rev": "3f9ef8b4ca0d65b059c0be1277bd2f0c7a9968fb", + "revCount": 10, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_1996" + }, + "original": { + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_1996" + } + }, + "skynet_website_2003": { + "inputs": { + "nixpkgs": "nixpkgs_15", + "utils": "utils_8" + }, "locked": { "lastModified": 1743721206, "narHash": "sha256-n9JGscEsckoasfmvpWKJ0kifQp1KPw8MbWPHhmmkLCU=", @@ -1058,8 +1092,8 @@ }, "skynet_website_2006": { "inputs": { - "nixpkgs": "nixpkgs_15", - "utils": "utils_8" + "nixpkgs": "nixpkgs_16", + "utils": "utils_9" }, "locked": { "lastModified": 1743715699, @@ -1077,8 +1111,8 @@ }, "skynet_website_2016": { "inputs": { - "nixpkgs": "nixpkgs_16", - "utils": "utils_9" + "nixpkgs": "nixpkgs_17", + "utils": "utils_10" }, "locked": { "lastModified": 1743722645, @@ -1096,8 +1130,8 @@ }, "skynet_website_2022": { "inputs": { - "nixpkgs": "nixpkgs_17", - "utils": "utils_10" + "nixpkgs": "nixpkgs_18", + "utils": "utils_11" }, "locked": { "lastModified": 1743727062, @@ -1117,8 +1151,8 @@ }, "skynet_website_2023": { "inputs": { - "nixpkgs": "nixpkgs_18", - "utils": "utils_11" + "nixpkgs": "nixpkgs_19", + "utils": "utils_12" }, "locked": { "lastModified": 1696876711, @@ -1138,8 +1172,8 @@ }, "skynet_website_2024": { "inputs": { - "nixpkgs": "nixpkgs_19", - "utils": "utils_12" + "nixpkgs": "nixpkgs_20", + "utils": "utils_13" }, "locked": { "lastModified": 1732375016, @@ -1159,8 +1193,8 @@ }, "skynet_website_games": { "inputs": { - "nixpkgs": "nixpkgs_20", - "utils": "utils_13" + "nixpkgs": "nixpkgs_21", + "utils": "utils_14" }, "locked": { "lastModified": 1727122069, @@ -1179,8 +1213,8 @@ "skynet_website_wiki": { "inputs": { "alejandra": "alejandra_2", - "nixpkgs": "nixpkgs_22", - "utils": "utils_14" + "nixpkgs": "nixpkgs_23", + "utils": "utils_15" }, "locked": { "lastModified": 1739580335, @@ -1347,6 +1381,21 @@ "type": "github" } }, + "systems_18": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1489,6 +1538,24 @@ "inputs": { "systems": "systems_13" }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_11": { + "inputs": { + "systems": "systems_14" + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -1503,9 +1570,9 @@ "type": "github" } }, - "utils_11": { + "utils_12": { "inputs": { - "systems": "systems_14" + "systems": "systems_15" }, "locked": { "lastModified": 1689068808, @@ -1521,9 +1588,9 @@ "type": "github" } }, - "utils_12": { + "utils_13": { "inputs": { - "systems": "systems_15" + "systems": "systems_16" }, "locked": { "lastModified": 1710146030, @@ -1539,9 +1606,9 @@ "type": "github" } }, - "utils_13": { + "utils_14": { "inputs": { - "systems": "systems_16" + "systems": "systems_17" }, "locked": { "lastModified": 1694529238, @@ -1557,9 +1624,9 @@ "type": "github" } }, - "utils_14": { + "utils_15": { "inputs": { - "systems": "systems_17" + "systems": "systems_18" }, "locked": { "lastModified": 1710146030, @@ -1706,11 +1773,11 @@ "systems": "systems_12" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5c7dc2b..214862d 100644 --- a/flake.nix +++ b/flake.nix @@ -59,6 +59,7 @@ skynet_website_2016.url = "git+https://forgejo.skynet.ie/Skynet/website_2016"; skynet_website_2006.url = "git+https://forgejo.skynet.ie/Skynet/website_2006"; skynet_website_2003.url = "git+https://forgejo.skynet.ie/Skynet/website_2003"; + skynet_website_1996.url = "git+https://forgejo.skynet.ie/Skynet/website_1996"; }; nixConfig = { From 82848f6f5ac18d7d428bbfa9ca3473d028b93e33 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 7 Apr 2025 23:51:45 +0100 Subject: [PATCH 046/107] tmp: leaving this here to work on teh ldap after my fyp demo day --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 214862d..fe31021 100644 --- a/flake.nix +++ b/flake.nix @@ -32,6 +32,7 @@ ### skynet backend ### ###################### skynet_ldap_backend.url = "git+https://forgejo.skynet.ie/Skynet/ldap_backend"; +# skynet_ldap_backend.url = "git+file:/_college/CompSoc/Skynet/ldap_backend?shallow=1"; skynet_ldap_frontend.url = "git+https://forgejo.skynet.ie/Skynet/ldap_frontend"; skynet_website_wiki.url = "git+https://forgejo.skynet.ie/Skynet/wiki"; skynet_website_games.url = "git+https://forgejo.skynet.ie/Skynet/website_games"; From 555d3d465df2cbbc58ea503243da320dc1cf2526 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 8 Apr 2025 00:15:39 +0100 Subject: [PATCH 047/107] feat: joys of being an admin, able to bend the rules for myself --- applications/git/forgejo.nix | 1 + flake.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/applications/git/forgejo.nix b/applications/git/forgejo.nix index aa8fd86..51f2869 100644 --- a/applications/git/forgejo.nix +++ b/applications/git/forgejo.nix @@ -70,6 +70,7 @@ in { locations."/" = { proxyPass = "http://localhost:${toString cfg.forgejo.port}"; extraConfig = '' + add_header Content-Security-Policy "frame-ancestors 'self' https://silver.users.skynet.ie"; client_max_body_size 1000M; ''; }; diff --git a/flake.nix b/flake.nix index fe31021..c773a8c 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,7 @@ ### skynet backend ### ###################### skynet_ldap_backend.url = "git+https://forgejo.skynet.ie/Skynet/ldap_backend"; -# skynet_ldap_backend.url = "git+file:/_college/CompSoc/Skynet/ldap_backend?shallow=1"; + # skynet_ldap_backend.url = "git+file:/_college/CompSoc/Skynet/ldap_backend?shallow=1"; skynet_ldap_frontend.url = "git+https://forgejo.skynet.ie/Skynet/ldap_frontend"; skynet_website_wiki.url = "git+https://forgejo.skynet.ie/Skynet/wiki"; skynet_website_games.url = "git+https://forgejo.skynet.ie/Skynet/website_games"; From 74c2a029cc6b22efa00a3077532bc62bfbbd9d6e Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Tue, 8 Apr 2025 13:21:04 +0000 Subject: [PATCH 048/107] Updated flake for skynet_website_1996 --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index ee90678..0e5fc9e 100644 --- a/flake.lock +++ b/flake.lock @@ -1058,11 +1058,11 @@ "utils": "utils_7" }, "locked": { - "lastModified": 1744063133, - "narHash": "sha256-MAevnJsxpaimUzJepL2BpbxlbRVCq3l9G990+LxNKEY=", + "lastModified": 1744118392, + "narHash": "sha256-0W+9obJUFjArArqULQ8pqJuFN5cY5ir0yRZPfhReh8I=", "ref": "refs/heads/main", - "rev": "3f9ef8b4ca0d65b059c0be1277bd2f0c7a9968fb", - "revCount": 10, + "rev": "19ec9fa4c4dafc68ce8b24653782598834a5405d", + "revCount": 13, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_1996" }, From c6a50e2d20731c2991302c2157d2d54d8d72a31d Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Tue, 8 Apr 2025 23:29:44 +0000 Subject: [PATCH 049/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 0e5fc9e..023973d 100644 --- a/flake.lock +++ b/flake.lock @@ -980,11 +980,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1741928371, - "narHash": "sha256-IhZQ8XJsQ1hmf3+plWSYEqw7dFjcgbPUhRWkpsQOrOk=", + "lastModified": 1744153580, + "narHash": "sha256-/De9zVIAGnAhvP2HxVukKQTHoAM8v9F4DhuaUsYGdv8=", "ref": "refs/heads/main", - "rev": "7f7e7ac598f4a9e03c5bd205f1507cd7a76394fe", - "revCount": 248, + "rev": "e7425588a6aa93af44b7f9f33d3b318992306bdb", + "revCount": 249, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From f7412b08fb57b9818a4aebe6f457f360ce16f392 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Thu, 24 Apr 2025 03:50:05 +0000 Subject: [PATCH 050/107] Updated flake for skynet_website_wiki --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 023973d..fb653aa 100644 --- a/flake.lock +++ b/flake.lock @@ -1217,11 +1217,11 @@ "utils": "utils_15" }, "locked": { - "lastModified": 1739580335, - "narHash": "sha256-n9LuI33Ycen3bLS/F5b6df7F61A2wpCRG7Cf1FeVRlc=", + "lastModified": 1745466454, + "narHash": "sha256-st63Yf+KzhrontRBVdlQ/TR6TXAqpoOHvP0VqEYTDY4=", "ref": "refs/heads/main", - "rev": "1df4c0bcd32414fee9bd7ef47bed1137d9f4576a", - "revCount": 126, + "rev": "e135e90a8ee46e57f35e6d74799a8e4ccaea70a9", + "revCount": 151, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 6390d090590b6212a1d3ccf2af9d25d98a10b522 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 29 Apr 2025 01:01:55 +0100 Subject: [PATCH 051/107] feat: all mail from our own internal mail gateway gets put into its own folder for everyone --- applications/email.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/applications/email.nix b/applications/email.nix index 2129de2..2341952 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -113,7 +113,11 @@ with lib; let address :domain ["To", "Cc"] "skynet.ie" ){ if address :matches ["To", "Cc"] "*@skynet.ie" { - if header :is "X-Spam" "Yes" { + # handle spam reports specifically for teh service accounts in each users inbox + if address :matches ["From"] "postmaster@mimi.skynet.ie" { + fileinto :create "''${1}.Spam_Report"; + stop; + } else if header :is "X-Spam" "Yes" { fileinto :create "''${1}.Junk"; stop; } else { @@ -122,6 +126,13 @@ with lib; let } } } + + # handle spam Reports for general users + if address :matches ["From"] "postmaster@mimi.skynet.ie" { + fileinto :create "INBOX..Spam_Report"; + stop; + } + if allof ( address :localpart ["From"] ["${toString create_config_to}"], address :domain ["From"] "skynet.ie" From b71a516fe44380becf635fca03f6bae0d4ebb9b2 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 8 May 2025 17:12:34 +0100 Subject: [PATCH 052/107] doc: add the request to open teh TF2/CSGO2 ports --- ITD/Firewall_Rules.csv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ITD/Firewall_Rules.csv b/ITD/Firewall_Rules.csv index 76cd029..ebc5333 100644 --- a/ITD/Firewall_Rules.csv +++ b/ITD/Firewall_Rules.csv @@ -45,4 +45,5 @@ SKYNET_FIREWALL_00033,Add,i24-06-04_017,Complete,All,-,193.1.99.91,SKYNET00017,8 ,Add,i24-07-15_112,Denied,193.1.99.75,-,-,-,22,-,Response from ITD - 'Our IT Security team have advised that port 22 and port 2222 are only to be allowed through the VPN and will not be opened to allow inbound ssh connections directly from the internet' SKYNET_FIREWALL_00034,Add,i25-01-26_075,Complete,All,-,193.1.99.91,SKYNET00017,-,23318-23325,Ports for Minecraft Bedrock on the main games server. SKYNET_FIREWALL_00035,Add,i25-02-14_114,Complete,193.1.99.75,SKYNET00008,193.1.96.165,SKYNET00012,22,-,Allow our forgejo runner to access and deploy to teh external server -SKYNET_FIREWALL_00036,Add,i25-03-11_125,Complete,All,-,193.1.99.86,SKYNET00027,25,-,Email Filter \ No newline at end of file +SKYNET_FIREWALL_00036,Add,i25-03-11_125,Complete,All,-,193.1.99.86,SKYNET00027,25,-,Email Filter +SKYNET_FIREWALL_00037,Add,i25-03-30_018,Complete,All,-,193.1.99.91,SKYNET00017,27015/27016/27020,27015/27020,CSGO/TF2 Ports \ No newline at end of file From a7a7b8489a34f649e27fed2088ef600810793e75 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 13 May 2025 14:49:35 +0100 Subject: [PATCH 053/107] fix: sieve script had errors involving teh if else --- applications/email.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/applications/email.nix b/applications/email.nix index 2341952..72fd7ea 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -117,19 +117,21 @@ with lib; let if address :matches ["From"] "postmaster@mimi.skynet.ie" { fileinto :create "''${1}.Spam_Report"; stop; - } else if header :is "X-Spam" "Yes" { - fileinto :create "''${1}.Junk"; - stop; } else { - fileinto :create "''${1}"; - stop; + if header :is "X-Spam" "Yes" { + fileinto :create "''${1}.Junk"; + stop; + } else { + fileinto :create "''${1}"; + stop; + } } } } # handle spam Reports for general users if address :matches ["From"] "postmaster@mimi.skynet.ie" { - fileinto :create "INBOX..Spam_Report"; + fileinto :create "INBOX.Spam_Report"; stop; } From 5e33119b147696794422ecbee035c17d7800c5eb Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 13 May 2025 15:21:06 +0100 Subject: [PATCH 054/107] feat: better sieve script --- applications/email.nix | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/applications/email.nix b/applications/email.nix index 72fd7ea..4808c35 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -106,10 +106,11 @@ with lib; let require ["fileinto", "reject"]; require "variables"; require "regex"; + require "subaddress"; # this should be close to teh last step if allof ( - address :localpart ["To", "Cc"] ["${toString create_config_to}"], + address :user ["To", "Cc"] ["${toString create_config_to}"], address :domain ["To", "Cc"] "skynet.ie" ){ if address :matches ["To", "Cc"] "*@skynet.ie" { @@ -118,12 +119,21 @@ with lib; let fileinto :create "''${1}.Spam_Report"; stop; } else { - if header :is "X-Spam" "Yes" { - fileinto :create "''${1}.Junk"; - stop; + # no detail, proceed normally + if address :detail ["To", "Cc"] "" { + if header :is "X-Spam" "Yes" { + fileinto :create "''${1}.Junk"; + stop; + } else { + fileinto :create "''${1}"; + stop; + } } else { - fileinto :create "''${1}"; - stop; + # user+subdir + if address :matches ["To", "Cc"] "*+*@skynet.ie" { + fileinto :create "''${1}.''${2}"; + stop; + } } } } From 575a617a10adf85e52edaf334034790d1d2db967 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 13 May 2025 16:17:07 +0100 Subject: [PATCH 055/107] fix: the gateway does spf checking, so no need to do it twice --- applications/email.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/applications/email.nix b/applications/email.nix index 4808c35..8c49dcd 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -490,6 +490,10 @@ in { # 20MB max size messageSizeLimit = 20000000; + policydSPFExtraConfig = '' + skip_addresses = 193.1.99.86/32 + ''; + ldap = { enable = true; uris = cfg.ldap.hosts; From 14732ead0fda42ab64427a392472bb12dead2e0b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 15 May 2025 00:41:15 +0100 Subject: [PATCH 056/107] fix: simplify sieve script --- applications/email.nix | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/applications/email.nix b/applications/email.nix index 8c49dcd..ec5e2a6 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -118,23 +118,21 @@ with lib; let if address :matches ["From"] "postmaster@mimi.skynet.ie" { fileinto :create "''${1}.Spam_Report"; stop; + } + + # user+subdir + if address :matches ["To", "Cc"] "*+*@skynet.ie" { + fileinto :create "''${1}.''${2}"; + stop; + } + + # no detail, proceed normally + if header :is "X-Spam" "Yes" { + fileinto :create "''${1}.Junk"; + stop; } else { - # no detail, proceed normally - if address :detail ["To", "Cc"] "" { - if header :is "X-Spam" "Yes" { - fileinto :create "''${1}.Junk"; - stop; - } else { - fileinto :create "''${1}"; - stop; - } - } else { - # user+subdir - if address :matches ["To", "Cc"] "*+*@skynet.ie" { - fileinto :create "''${1}.''${2}"; - stop; - } - } + fileinto :create "''${1}"; + stop; } } } From b600af4ff5d87f4976531ee1fa34294690bc5f2a Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 15 May 2025 00:44:17 +0100 Subject: [PATCH 057/107] feat: add the gateway ip to teh rspamd whitelist --- applications/email.nix | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/applications/email.nix b/applications/email.nix index ec5e2a6..9c972b4 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -563,14 +563,23 @@ in { }; # tune the spam filter - /* - services.rspamd.extraConfig = '' - actions { - reject = null; # Disable rejects, default is 15 - add_header = 7; # Add header when reaching this score - greylist = 4; # Apply greylisting when reaching this score - } - ''; - */ + services.rspamd.locals = { + "multimap.conf" = { + text = '' + IP_WHITELIST { + type = "ip"; + prefilter = true; + map = "/etc/rspamd/local.d/ip_whitelist.map"; + action = "accept"; + } + ''; + }; + + "ip_whitelist.map" = { + text = '' + 193.1.99.86 + ''; + }; + }; }; } From 53c1869f8a656f58977ec121466fdffa6117ec52 Mon Sep 17 00:00:00 2001 From: silver <+silver@users.noreply.github.com> Date: Fri, 6 Jun 2025 16:21:50 +0000 Subject: [PATCH 058/107] Updated flake for skynet_ldap_backend --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index fb653aa..6d50b52 100644 --- a/flake.lock +++ b/flake.lock @@ -1001,11 +1001,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1741691220, - "narHash": "sha256-OSRyKWVqSdeciy1DGYh63fxs7SbppeGRu8/ui54sTtc=", + "lastModified": 1745459480, + "narHash": "sha256-ER4nCZQrbTmeRE+P+xm1T9GjBf4YvgeTMrOMGandmkE=", "ref": "refs/heads/main", - "rev": "35896efa04bb50e2342946e33367245b1cb4460e", - "revCount": 246, + "rev": "b714571b85bcd80600c743d3da4c840ff83adb86", + "revCount": 247, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/ldap_backend" }, From d1929bfca25e3463c94977b90f8b94b98b713c9f Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 16 Jun 2025 13:20:09 +0000 Subject: [PATCH 059/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 6d50b52..0b48129 100644 --- a/flake.lock +++ b/flake.lock @@ -980,11 +980,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1744153580, - "narHash": "sha256-/De9zVIAGnAhvP2HxVukKQTHoAM8v9F4DhuaUsYGdv8=", + "lastModified": 1750079273, + "narHash": "sha256-Z3N6AsyKLwFyJzUrBgrpWV8oXSIfplhNVYn7IyZYG0U=", "ref": "refs/heads/main", - "rev": "e7425588a6aa93af44b7f9f33d3b318992306bdb", - "revCount": 249, + "rev": "8560ed6de541dbe64f00b8ea1bb3a334a9d33f70", + "revCount": 252, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 8591ccd97c6dc442696e36c804e5134cd6844ae2 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 16 Jun 2025 21:10:53 +0100 Subject: [PATCH 060/107] fix: for some reason this secret had gotten renamed --- secrets/secrets.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 2428526..db5670f 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -136,7 +136,7 @@ in { "backup/restic_pw.age".publicKeys = users ++ restic; # discord bot and discord - "discord/token1.age".publicKeys = users ++ discord; + "discord/token.age".publicKeys = users ++ discord; # email stuff "email/details.age".publicKeys = users ++ ldap ++ discord; From ef5cc7dba879b3bc86c6bbb1ee4d42c530af3718 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 16 Jun 2025 21:12:02 +0100 Subject: [PATCH 061/107] feat: added ``COMPSOC_DISCORD`` and expanded ``COMMITTEE_CATEGORY`` --- secrets/wolves/details.age | Bin 1943 -> 2048 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/secrets/wolves/details.age b/secrets/wolves/details.age index 27a607684bf92907023fdfcfe23453a9f1c69d55..2dd6bfac53a4a5d0cb6c04b5a539f823304f5429 100644 GIT binary patch delta 1932 zcmbQv-ykqSr#>Phz{ADGyTY_MCrdji)uPJP%fiptH$9}(sWQ~H&{e;}(jcX>#GouR zk}EqgEz>PC%*WT;Bg`YRz{$WhG`KL!Ij1lv$S2ZJKRwH_FgQY6yClEdmrK`9p}06h zH#Nn`)YQ;Y!6cw6DnDJJpv)vYH!-_BH!VHG-!dXA+|4B1B_l1_$gr#`E5M}0tkA76 zA|=1lQa{&|%h0H>)X_g6-9IBN*E`iY+`OzP(cRO?ud>)HBP%u6*f-3=sKPrh-6Al1 z;z#lDY=bPFUJh+0`tIPf1|R{v?v$HjEX=mZ_6S# z|1b-uk_vzGQj@$QPou0tQ|}CC@4}?SbR&f(zUfgZhWcfx zsm2v1=7FWTIZjUQCQ%VC#${z?=J}3g#h%H5UX>YvWmU;shQ(Fkt|q>Pfv%MUWO^@CdE0H#R18a&oYYFnC1(U?7?fFt6{i%tTl!~3 z28Wqe1X(y`7KHg4YNsa}rdt|0nP(((WqCxnSR|VyXISQh+xmLLrmbw;u zmgi^(ghv>rSO%M#7ke3?$AEWOkwsCtLT*`LW^$l`f0=)AR)mF@e_4G}gpWl8O zc}{?3ut}-0vv+R3qqnDHI#+mZQl7hER+4#=Nk~q(tD}BssB4J1g}HgEftg!*xMfOc zL}8?JftP`gE4p=QnTdv}feH~WW|d}zKFP^J$w`43UKYgxW(Fq40YyPsRmti3Wm#nf zrsXcVrS4fi&dFScL1`J`z9y+TF5zkB>3M0PIT`Nm6-HjAmbpHG0p>orL3xqMY5Bex z>7kPoS;XtpoGo3GLvxEOOmixIQ%$n zOud`~5*^bm({hSk3xji0!aaP01Ka}ii?dCma$F38vdmnHxhnMYGO~+{EBt)JBhp=R zN<;np{3?rri!(g^QVI-w3Q_|~Q_?ewLfz7eAt6_iZ5mn>mXn`Xo|EHTo*10rVU|&* zoss0_6qQ(#YvSaVUJ#U-=I&UY%oVEdVd0qMnXPYDnO0nuZC;vbpdXf;RpMpgYGIJ= z>0z23oSu^yTAAXK&84fWt6=O?6=v!mSQX^u7M`6Q8JJ~WoSC1K66N7s=~fbD;im2A zTW?;PR_<@&>C3fv+VnSHB^ys=8SnHB%==%PwDL*O^m%%}SKeN=_G@tJ?wcOBla-(4 zF)h^$-1h6<>X;ID-}jrQ_x_$}d0C?Gnct7?&f(ot3_^~o{11F<*xqtpaDTTV-|B3; zKZbVOe>Cea>TkZEGH=`2qRZ1ib$&eYcJZSduY0Gk)o*A$_NwCV_Dg2|Cz_6F1Y7O+ z`O|(PYsyW%3&*PVsw>BTaMjE$m!PBYmcm)B2K%V-|}YH znSeFUFM__AIzQ8N>9sm_Hy*7S1QedB&2`gT@uYrNnNS=jPfafBdmTFTVfx^P5MRH5EOhRRcF}4*R_Otdad}gH31s|1PO? z>9O^@H1|$hNg|WFgSM2sbw{_){TIozHaF-^UTgbbpZ~+GliMe)JhzH>=Hw5*8@0W8 z9OKTjO~3Z-+`5LVHjA8P_%`Rde$DavJrCzy zW?x~jwb-ib>mP2H$yWb)-ygNoH@WBJow>(1$1~yY$K<(wSGs0y)O_>jLhP%%$LC85 ztUldT;oSI7@T}tfe7R{g$}dYdHPzm!?@yes$du^y!Wm)8t0m zGpE0mUhxgyH|Om2wxi4wr%YdJtG9Ih!acqHU*m3DEVf?Dvh}xUMRitVw}t+eIMW6F zD|$M2bEdzW^4ra*?83)0VjG&L$vsLfFi*KUgZ*f#{KT}VWxu0N2fjK|9KTscTK&U5 zb;iB*iYud41%GBo@d(B-+Y7I*ykj@vwdcC%j2Mxo>Th>aj%r5#iFAKZC_8E0fzQT9 zo2U2r#+ffau(WjbO`&RyC%uolIU0(l3&&gXB_Enl;Z)vQwPq2+v(33@iob`g*1snw z;8T`!X5)0DRdVld^xbEXFT4_vH7#M$6KzRbu6-Y!GT6`9&&kEottvA#G$f-WluOr6p}06h zH#Nn`)YQ;Y!6cw6DnDHzwf(j)7SgftERj zZcZt_Nma@DW*$jZo{>QT1&*Eu#TCwG!A9XG9&V+f6$a&8+1Vz61$jvU#?Jn^L75)K z<`zY621W%Q1?4$8{$2(7spjF9m2Sp?Mj-~1&oYYFXIVy+N4lB$d6jcoen?2F zrManBp0A;4MnPtvk6%PyHdl~QMMz4CXGy7Fv2TPyPD!b|TY6eaRBCRpzJG?RMO9X2 zxnWqIacQVwKDu>jnTdv}feHbs!69Bb8AXmpjvfY?A;rb1My5qkRYop3=8jRBrKR5b zrf%tG1?4&U9_d_3jvjv6Nu~wP&XyLYdD*Txm1*WFh83Y+#zmIdsg8aI{fu3UON|NwJWPv^_EZi(zEX&fIg7lNZGSU*mBU1u=oWk-PGqi)Xv%_<9B7##2v`x^xQW{m|WSp*G z;8gked5t?ZnmSY%dUglAl=o?a1?v$I&W#Ne89dPupaWqN^WSy7Nhc}cm4FIQD&iE&U>dUf z6HW7-%L)y&({eNPOACvW%}R>Pa}2o3Bg?(L%p?3F!~GpIa@?arJPMpVA}q2BE4BSg z0t1~&^a~5K+=DF4!#%llb#)ayEs~7Wf3>-b^y=#qpu_oekUcj{x`N1O8BzLx#O<4ldSQE0#Wlhe>sq+-?CL5kuuIDZMq3-%pK4#%5%rt%=W9(&m)iUGfVr{?r*YI5&QOEiMyH;w&Iwx)6QRCygVk%V=s>Q z%X_KI_u%cHGjH>?{Z6YowPlsr&TpUg%Vd4iJ+J+@DaRs1yIuMBZzg`7`h{CfwI1`7 zadBSK*}5!e;j1g2dmevjJ^A2Wics?7TQXB`I3;yy``e$WdCju0GGFW82DL}at2ZY^ zN!-7n#B?WxOM022=c%N%tU@O@Etxkze!`Dt<~0*jVyss7_)Tv%W=d+rsXCyO<5 zV}sJN_!DPN3J9{%j(mLei`V+iH`3hez31#+7Vu}$>{}nF#V23p_2QcOVeg@{g?Uiie0!W=j4erTJr v=ewioq&ttpR$AI^wwN}1j->Fi$^~!Iv=xtiy1QSj@|m%VF?Xt**bhMft)|Yh From 1131f51382f2c50b3d5c037c76149120155c78a5 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Tue, 17 Jun 2025 16:33:17 +0000 Subject: [PATCH 062/107] Updated flake for skynet_discord_bot --- flake.lock | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 0b48129..5975f6d 100644 --- a/flake.lock +++ b/flake.lock @@ -558,6 +558,22 @@ } }, "nixpkgs-mozilla": { + "flake": false, + "locked": { + "lastModified": 1744624473, + "narHash": "sha256-S6zT/w5SyAkJ//dYdjbrXgm+6Vkd/k7qqUl4WgZ6jjk=", + "owner": "mozilla", + "repo": "nixpkgs-mozilla", + "rev": "2292d4b35aa854e312ad2e95c4bb5c293656f21a", + "type": "github" + }, + "original": { + "owner": "mozilla", + "repo": "nixpkgs-mozilla", + "type": "github" + } + }, + "nixpkgs-mozilla_2": { "flake": false, "locked": { "lastModified": 1740762144, @@ -977,14 +993,15 @@ "inputs": { "naersk": "naersk_2", "nixpkgs": "nixpkgs_9", + "nixpkgs-mozilla": "nixpkgs-mozilla", "utils": "utils_3" }, "locked": { - "lastModified": 1750079273, - "narHash": "sha256-Z3N6AsyKLwFyJzUrBgrpWV8oXSIfplhNVYn7IyZYG0U=", + "lastModified": 1750173717, + "narHash": "sha256-eyBR9LqrzTH6pSKJi3sgZC4ascjcmqBaaLUZUpTQ1BY=", "ref": "refs/heads/main", - "rev": "8560ed6de541dbe64f00b8ea1bb3a334a9d33f70", - "revCount": 252, + "rev": "3a56d7bba5fa2ca562ab5288f8799339cdc947e3", + "revCount": 286, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, @@ -997,7 +1014,7 @@ "inputs": { "naersk": "naersk_3", "nixpkgs": "nixpkgs_11", - "nixpkgs-mozilla": "nixpkgs-mozilla", + "nixpkgs-mozilla": "nixpkgs-mozilla_2", "utils": "utils_4" }, "locked": { From 6bd5061c04b32874491d9be75df65507cb77b0bf Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 17 Jun 2025 17:41:24 +0100 Subject: [PATCH 063/107] feat: some minor improvements to teh devshell --- flake.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index c773a8c..b1402af 100644 --- a/flake.nix +++ b/flake.nix @@ -64,7 +64,6 @@ }; nixConfig = { - bash-prompt-suffix = "[Skynet Dev] "; extra-substituters = "https://nix-cache.skynet.ie/skynet-cache"; extra-trusted-public-keys = "skynet-cache:zMFLzcRZPhUpjXUy8SF8Cf7KGAZwo98SKrzeXvdWABo="; }; @@ -82,7 +81,7 @@ formatter.x86_64-linux = alejandra.defaultPackage."x86_64-linux"; devShells.x86_64-linux.default = pkgs.mkShell { - name = "Skynet build env"; + name = "Skynet"; nativeBuildInputs = [ pkgs.buildPackages.git colmena.defaultPackage."x86_64-linux" @@ -90,7 +89,7 @@ pkgs.buildPackages.nmap ]; buildInputs = [agenix.packages.x86_64-linux.default]; - shellHook = ''export EDITOR="${pkgs.nano}/bin/nano --nonewlines"; unset LD_LIBRARY_PATH;''; + shellHook = ''export PROMPT_DIRTRIM=3; export PS1="[Skynet] \w:\$ "''; }; colmena = { From 5744a0575f7dae9f6ef1df7a329f76c10b1f576c Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 17 Jun 2025 19:53:44 +0100 Subject: [PATCH 064/107] feat: update nixpkgs and the mailserver --- applications/email.nix | 12 +++--- flake.lock | 86 +++++++++++++++++++++++++++++++++--------- 2 files changed, 75 insertions(+), 23 deletions(-) diff --git a/applications/email.nix b/applications/email.nix index 9c972b4..d7a6381 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -470,6 +470,8 @@ in { mailserver = { enable = true; + stateVersion = 1; + fqdn = "${cfg.sub}.${cfg.domain}"; domains = [ cfg.domain @@ -488,9 +490,9 @@ in { # 20MB max size messageSizeLimit = 20000000; - policydSPFExtraConfig = '' - skip_addresses = 193.1.99.86/32 - ''; + # policydSPFExtraConfig = '' + # skip_addresses = 193.1.99.86/32 + # ''; ldap = { enable = true; @@ -504,13 +506,13 @@ in { searchScope = "sub"; dovecot = { - userFilter = "(skMail=%u)"; + userFilter = "(skMail=%{user})"; # can lock down how much space each user has access to from ldap userAttrs = "quotaEmail=quota_rule=*:bytes=%$,=quota_rule2=Trash:storage=+100M"; # accept emails in, but only allow access to paid up members - passFilter = "(&(|${create_filter cfg.groups})(skMail=%u))"; + passFilter = "(&(|${create_filter cfg.groups})(skMail=%{user}))"; }; postfix = { diff --git a/flake.lock b/flake.lock index 5975f6d..804e475 100644 --- a/flake.lock +++ b/flake.lock @@ -247,11 +247,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -379,6 +379,54 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "simple-nixos-mailserver", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "simple-nixos-mailserver", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1749636823, + "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "623c56286de5a3193aa38891a6991b28f9bab056", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "simple-nixos-mailserver", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "haskell-flake": { "locked": { "lastModified": 1675296942, @@ -542,19 +590,20 @@ "type": "github" } }, - "nixpkgs-24_05": { + "nixpkgs-25_05": { "locked": { - "lastModified": 1717144377, - "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "lastModified": 1749727998, + "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-24.05", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-mozilla": { @@ -864,11 +913,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "type": "github" }, "original": { @@ -970,17 +1019,18 @@ "inputs": { "blobs": "blobs", "flake-compat": "flake-compat_2", + "git-hooks": "git-hooks", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-24_05": "nixpkgs-24_05" + "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1723233349, - "narHash": "sha256-0NqGJ+wFxmK6DEEvlZ+jGMdDkIaQ+S54kBStwkGUaO8=", + "lastModified": 1750183846, + "narHash": "sha256-owKJ2rsa/0WVZQAprlbqgVAAGlz3MFuvgNea3+ic4fs=", "ref": "refs/heads/master", - "rev": "a98a93cf22cd53a92143703a0a5b6f76438a15ba", - "revCount": 594, + "rev": "c097bd662c9e1aea8c1fca10d57188e81c5574a0", + "revCount": 743, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/misc_nixos-mailserver" }, From f010291c57017e45bba736e79c7091a4e448b855 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 17 Jun 2025 20:13:48 +0100 Subject: [PATCH 065/107] feat: dont tie lix to nixpkgs This will mean that it will only be built again once the package is updated --- flake.lock | 156 +++++++++++++++++++++++++++++------------------------ flake.nix | 2 +- 2 files changed, 86 insertions(+), 72 deletions(-) diff --git a/flake.lock b/flake.lock index 804e475..f922c31 100644 --- a/flake.lock +++ b/flake.lock @@ -47,7 +47,7 @@ "inputs": { "fenix": "fenix_2", "flakeCompat": "flakeCompat_2", - "nixpkgs": "nixpkgs_22" + "nixpkgs": "nixpkgs_23" }, "locked": { "lastModified": 1719514321, @@ -483,9 +483,7 @@ "flake-utils": "flake-utils_3", "flakey-profile": "flakey-profile", "lix": "lix", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1737237494, @@ -519,7 +517,7 @@ }, "naersk_2": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1721727458, @@ -537,7 +535,7 @@ }, "naersk_3": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1739824009, @@ -639,6 +637,21 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1722995383, + "narHash": "sha256-UzuXo7ZM8ZK0SkWFhHocKkLSGQPHS4JxaE1jvVR4fUo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "957d95fc8b9bf1eb60d43f8d2eba352b71bbf2be", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1741462378, "narHash": "sha256-ZF3YOjq+vTcH51S+qWa1oGA9FgmdJ67nTNPG2OIlXDc=", @@ -652,7 +665,7 @@ "type": "indirect" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1741513245, "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", @@ -667,7 +680,7 @@ "type": "indirect" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1687274257, "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", @@ -681,7 +694,7 @@ "type": "indirect" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1724114134, "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", @@ -695,20 +708,6 @@ "type": "indirect" } }, - "nixpkgs_14": { - "locked": { - "lastModified": 1741037377, - "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "02032da4af073d0f6110540c8677f16d4be0117f", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_15": { "locked": { "lastModified": 1741037377, @@ -738,6 +737,20 @@ } }, "nixpkgs_17": { + "locked": { + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_18": { "locked": { "lastModified": 1690026219, "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", @@ -751,7 +764,7 @@ "type": "indirect" } }, - "nixpkgs_18": { + "nixpkgs_19": { "locked": { "lastModified": 1724114134, "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", @@ -765,20 +778,6 @@ "type": "indirect" } }, - "nixpkgs_19": { - "locked": { - "lastModified": 1689935543, - "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1733212471, @@ -796,6 +795,20 @@ } }, "nixpkgs_20": { + "locked": { + "lastModified": 1689935543, + "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_21": { "locked": { "lastModified": 1724114134, "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", @@ -809,7 +822,7 @@ "type": "indirect" } }, - "nixpkgs_21": { + "nixpkgs_22": { "locked": { "lastModified": 1695978539, "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", @@ -823,7 +836,7 @@ "type": "indirect" } }, - "nixpkgs_22": { + "nixpkgs_23": { "locked": { "lastModified": 1668226844, "narHash": "sha256-G/S4FBWDAqHeBS/hfXwUCJbnaKnrQFoeeKwzvZEOgxM=", @@ -839,7 +852,7 @@ "type": "github" } }, - "nixpkgs_23": { + "nixpkgs_24": { "locked": { "lastModified": 1724395761, "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", @@ -912,6 +925,22 @@ } }, "nixpkgs_7": { + "locked": { + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { "locked": { "lastModified": 1749794982, "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", @@ -926,7 +955,7 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1723151389, "narHash": "sha256-9AVY0ReCmSGXHrlx78+1RrqcDgVSRhHUKDVV1LLBy28=", @@ -940,21 +969,6 @@ "type": "indirect" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1722995383, - "narHash": "sha256-UzuXo7ZM8ZK0SkWFhHocKkLSGQPHS4JxaE1jvVR4fUo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "957d95fc8b9bf1eb60d43f8d2eba352b71bbf2be", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -964,7 +978,7 @@ "compsoc_public": "compsoc_public", "flake-utils": "flake-utils_2", "lix-module": "lix-module", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "simple-nixos-mailserver": "simple-nixos-mailserver", "skynet_discord_bot": "skynet_discord_bot", "skynet_ldap_backend": "skynet_ldap_backend", @@ -1042,7 +1056,7 @@ "skynet_discord_bot": { "inputs": { "naersk": "naersk_2", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "nixpkgs-mozilla": "nixpkgs-mozilla", "utils": "utils_3" }, @@ -1063,7 +1077,7 @@ "skynet_ldap_backend": { "inputs": { "naersk": "naersk_3", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "nixpkgs-mozilla": "nixpkgs-mozilla_2", "utils": "utils_4" }, @@ -1083,7 +1097,7 @@ }, "skynet_ldap_frontend": { "inputs": { - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_13", "utils": "utils_5" }, "locked": { @@ -1102,7 +1116,7 @@ }, "skynet_website": { "inputs": { - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_14", "utils": "utils_6" }, "locked": { @@ -1121,7 +1135,7 @@ }, "skynet_website_1996": { "inputs": { - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_15", "utils": "utils_7" }, "locked": { @@ -1140,7 +1154,7 @@ }, "skynet_website_2003": { "inputs": { - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_16", "utils": "utils_8" }, "locked": { @@ -1159,7 +1173,7 @@ }, "skynet_website_2006": { "inputs": { - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_17", "utils": "utils_9" }, "locked": { @@ -1178,7 +1192,7 @@ }, "skynet_website_2016": { "inputs": { - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_18", "utils": "utils_10" }, "locked": { @@ -1197,7 +1211,7 @@ }, "skynet_website_2022": { "inputs": { - "nixpkgs": "nixpkgs_18", + "nixpkgs": "nixpkgs_19", "utils": "utils_11" }, "locked": { @@ -1218,7 +1232,7 @@ }, "skynet_website_2023": { "inputs": { - "nixpkgs": "nixpkgs_19", + "nixpkgs": "nixpkgs_20", "utils": "utils_12" }, "locked": { @@ -1239,7 +1253,7 @@ }, "skynet_website_2024": { "inputs": { - "nixpkgs": "nixpkgs_20", + "nixpkgs": "nixpkgs_21", "utils": "utils_13" }, "locked": { @@ -1260,7 +1274,7 @@ }, "skynet_website_games": { "inputs": { - "nixpkgs": "nixpkgs_21", + "nixpkgs": "nixpkgs_22", "utils": "utils_14" }, "locked": { @@ -1280,7 +1294,7 @@ "skynet_website_wiki": { "inputs": { "alejandra": "alejandra_2", - "nixpkgs": "nixpkgs_23", + "nixpkgs": "nixpkgs_24", "utils": "utils_15" }, "locked": { diff --git a/flake.nix b/flake.nix index b1402af..cf722be 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ lix-module = { url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs"; + # inputs.nixpkgs.follows = "nixpkgs"; }; # utility stuff From 4ff68b45f78820f6cded83f9f2dce6e49811df8e Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 17 Jun 2025 20:50:01 +0100 Subject: [PATCH 066/107] feat: bump the lix version This will mean that it will only be built again once the package is updated --- flake.lock | 20 ++++++++++---------- flake.nix | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index f922c31..b55bbe0 100644 --- a/flake.lock +++ b/flake.lock @@ -467,15 +467,15 @@ "lix": { "flake": false, "locked": { - "lastModified": 1737234286, - "narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=", - "rev": "2837da71ec1588c1187d2e554719b15904a46c8b", + "lastModified": 1746827285, + "narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=", + "rev": "47aad376c87e2e65967f17099277428e4b3f8e5a", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz" } }, "lix-module": { @@ -486,15 +486,15 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1737237494, - "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=", - "rev": "b90bf629bbd835e61f1317b99e12f8c831017006", + "lastModified": 1746838955, + "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=", + "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz" } }, "naersk": { diff --git a/flake.nix b/flake.nix index cf722be..034dd7b 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ # nixpkgs.url = "nixpkgs/nixos-unstable"; lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; # inputs.nixpkgs.follows = "nixpkgs"; }; From 79167f3966ee777e30b010b2b397274497ee051f Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 18 Jun 2025 01:57:35 +0100 Subject: [PATCH 067/107] fix: dnssec-validation needed to be set to auto, which is now its default value. https://bind9.readthedocs.io/en/v9.18.13/reference.html#namedconf-statement-dnssec-validation --- applications/dns/dns.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/dns/dns.nix b/applications/dns/dns.nix index da8577f..3286a98 100644 --- a/applications/dns/dns.nix +++ b/applications/dns/dns.nix @@ -369,7 +369,7 @@ in { # piles of no valid RRSIG resolving 'com/DS/IN' errors extraOptions = '' - dnssec-validation yes; + dnssec-validation auto; ''; # set the upstream dns servers From dfdc1e0fcc581887d023b8c495f499a4bab31216 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 18 Jun 2025 02:25:55 +0100 Subject: [PATCH 068/107] feat: the changes have been merged in, use the upstream module --- applications/proxmox-lxc.nix | 96 ------------------------------------ machines/_base.nix | 5 +- 2 files changed, 2 insertions(+), 99 deletions(-) delete mode 100644 applications/proxmox-lxc.nix diff --git a/applications/proxmox-lxc.nix b/applications/proxmox-lxc.nix deleted file mode 100644 index 9f1c970..0000000 --- a/applications/proxmox-lxc.nix +++ /dev/null @@ -1,96 +0,0 @@ -/* -Once https://github.com/NixOS/nixpkgs/pull/267764 is merged this can be removed -*/ -{ - config, - pkgs, - lib, - ... -}: -with lib; { - options.proxmoxLXC = { - enable = mkOption { - default = true; - type = types.bool; - description = lib.mdDoc "Whether to enable the Proxmox VE LXC module."; - }; - privileged = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable privileged mounts - ''; - }; - manageNetwork = mkOption { - type = types.bool; - default = false; - description = '' - Whether to manage network interfaces through nix options - When false, systemd-networkd is enabled to accept network - configuration from proxmox. - ''; - }; - manageHostName = mkOption { - type = types.bool; - default = false; - description = '' - Whether to manage hostname through nix options - When false, the hostname is picked up from /etc/hostname - populated by proxmox. - ''; - }; - }; - - config = let - cfg = config.proxmoxLXC; - in - mkIf cfg.enable { - system.build.tarball = pkgs.callPackage ../../lib/make-system-tarball.nix { - storeContents = [ - { - object = config.system.build.toplevel; - symlink = "none"; - } - ]; - - contents = [ - { - source = config.system.build.toplevel + "/init"; - target = "/sbin/init"; - } - ]; - - extraCommands = "mkdir -p root etc/systemd/network"; - }; - - boot = { - isContainer = true; - loader.initScript.enable = true; - }; - - console.enable = true; - - networking = mkIf (!cfg.manageNetwork) { - useDHCP = false; - useHostResolvConf = false; - useNetworkd = true; - # pick up hostname from /etc/hostname generated by proxmox - hostName = mkIf (!cfg.manageHostName) (mkForce ""); - }; - - services.openssh = { - enable = mkDefault true; - startWhenNeeded = mkDefault true; - }; - - systemd = { - mounts = mkIf (!cfg.privileged) [ - { - enable = false; - where = "/sys/kernel/debug"; - } - ]; - services."getty@".unitConfig.ConditionPathExists = ["" "/dev/%I"]; - }; - }; -} diff --git a/machines/_base.nix b/machines/_base.nix index 0fa84e6..18da744 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -11,9 +11,8 @@ with lib; let cfg = config.skynet; in { imports = [ - # custom lxc mocule until the patch gets merged in - ../applications/proxmox-lxc.nix - # (modulesPath + "/virtualisation/proxmox-lxc.nix") + # This is required for LXC to function properly + (modulesPath + "/virtualisation/proxmox-lxc.nix") # for the secrets inputs.agenix.nixosModules.default From 4fc1071225184d9ca2e74a04a2a9d54674a1a4aa Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 18 Jun 2025 03:14:04 +0100 Subject: [PATCH 069/107] temp: temp switch the dns servers since the recent changes left them unavailable --- machines/vendetta.nix | 2 +- machines/vigil.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/machines/vendetta.nix b/machines/vendetta.nix index 3cff501..7b89f84 100644 --- a/machines/vendetta.nix +++ b/machines/vendetta.nix @@ -57,7 +57,7 @@ in { server = { enable = true; # primary dns server (ns1) - primary = true; + primary = false; ip = ip_pub; }; }; diff --git a/machines/vigil.nix b/machines/vigil.nix index 421ebaa..78527fd 100644 --- a/machines/vigil.nix +++ b/machines/vigil.nix @@ -41,7 +41,7 @@ in { server = { enable = true; # secondary dns server (ns2) - primary = false; + primary = true; ip = ip_pub; }; }; From 5ca3265cc17bea668fb6c13f8a8b237d2dfbf2ca Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 18 Jun 2025 03:14:35 +0100 Subject: [PATCH 070/107] feat: fixed how sometimes updating servers mean that ye had to reset teh MAC address in Proxmox. This is done by letting each server manage its own network interface. --- applications/_base.nix | 24 ++++++++++++++++++++++++ machines/_base.nix | 6 +++++- machines/agentjones.nix | 14 +------------- machines/neuromancer.nix | 14 +------------- machines/skynet.nix | 2 ++ machines/vendetta.nix | 16 ++-------------- 6 files changed, 35 insertions(+), 41 deletions(-) diff --git a/applications/_base.nix b/applications/_base.nix index f96d7e4..c9f7f61 100644 --- a/applications/_base.nix +++ b/applications/_base.nix @@ -42,6 +42,16 @@ in { type = types.str; default = "${cfg.host.name}.skynet.ie"; }; + interface = mkOption { + type = types.str; + description = "Will most likely be ``eno1`` for physical servers."; + default = "eth0"; + }; + cidr = mkOption { + type = types.int; + description = "Most of our servers are /26, "; + default = 26; + }; }; }; @@ -60,6 +70,20 @@ in { } ]; + # set + networking = { + hostName = cfg.host.name; + defaultGateway.interface = lib.mkForce cfg.host.interface; + + # needs to have an address statically assigned + interfaces."${cfg.host.interface}".ipv4.addresses = [ + { + address = cfg.host.ip; + prefixLength = cfg.host.cidr; + } + ]; + }; + services.nginx = { virtualHosts = { # for every server unless explisitly defined redirect the ip to skynet.ie diff --git a/machines/_base.nix b/machines/_base.nix index 18da744..44dfadd 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -35,7 +35,11 @@ in { config = { # if its a lxc enable - proxmoxLXC.enable = cfg.lxc; + proxmoxLXC = { + enable = cfg.lxc; + manageNetwork = true; + manageHostName = true; + }; nix = { settings = { diff --git a/machines/agentjones.nix b/machines/agentjones.nix index 1fb3c4e..2c1ae09 100644 --- a/machines/agentjones.nix +++ b/machines/agentjones.nix @@ -21,6 +21,7 @@ Notes: Used to have Agent Smith as a partner but it died (Ironically) ip = ip_pub; name = name; hostname = hostname; + interface = "en01"; }; in { imports = [ @@ -44,19 +45,6 @@ in { # keep the wired usb connection alive (front panel) # networking.interfaces.enp0s29u1u5u2.useDHCP = true; - networking.hostName = name; - # this has to be defined for any physical servers - # vms are defined by teh vm host - networking = { - defaultGateway.interface = lib.mkForce "eno1"; - interfaces.eno1.ipv4.addresses = [ - { - address = ip_pub; - prefixLength = 26; - } - ]; - }; - # this server is teh firewall skynet_firewall = { # always good to know oneself diff --git a/machines/neuromancer.nix b/machines/neuromancer.nix index 6e2cbd9..7068310 100644 --- a/machines/neuromancer.nix +++ b/machines/neuromancer.nix @@ -22,25 +22,13 @@ Notes: ip = ip_pub; name = name; hostname = hostname; + interface = "en01"; }; in { imports = [ ./hardware/RM007.nix ]; - networking.hostName = name; - # this has to be defined for any physical servers - # vms are defined by teh vm host - networking = { - defaultGateway.interface = lib.mkForce "eno1"; - interfaces.eno1.ipv4.addresses = [ - { - address = ip_pub; - prefixLength = 26; - } - ]; - }; - deployment = { targetHost = hostname; targetPort = 22; diff --git a/machines/skynet.nix b/machines/skynet.nix index 720e9a3..546596e 100644 --- a/machines/skynet.nix +++ b/machines/skynet.nix @@ -23,6 +23,8 @@ Notes: Does not host offical sites ip = ip_pub; name = name; hostname = hostname; + interface = "eth1"; + cidr = 28; }; in { imports = [ diff --git a/machines/vendetta.nix b/machines/vendetta.nix index 7b89f84..faea1a5 100644 --- a/machines/vendetta.nix +++ b/machines/vendetta.nix @@ -22,14 +22,14 @@ Notes: Using the server that used to be called Earth ip = ip_pub; name = name; hostname = hostname; + # only required for physical servers + interface = "en01"; }; in { imports = [ ./hardware/RM002.nix ]; - networking.hostName = name; - deployment = { targetHost = ip_pub; targetPort = 22; @@ -38,18 +38,6 @@ in { tags = ["active-dns" "dns"]; }; - networking = { - # needs to have an address statically assigned - - defaultGateway.interface = lib.mkForce "eno1"; - interfaces.eno1.ipv4.addresses = [ - { - address = "193.1.99.120"; - prefixLength = 26; - } - ]; - }; - services.skynet = { host = host; backup.enable = true; From ffe77907c9e0a7c4ccd529eb469d7b0cb09a66f9 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Wed, 18 Jun 2025 03:05:58 +0000 Subject: [PATCH 071/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index b55bbe0..0274176 100644 --- a/flake.lock +++ b/flake.lock @@ -1061,11 +1061,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1750173717, - "narHash": "sha256-eyBR9LqrzTH6pSKJi3sgZC4ascjcmqBaaLUZUpTQ1BY=", + "lastModified": 1750215424, + "narHash": "sha256-vpvSJIa8q5NPup0dkG3GFtW6lgqasVZ1KOuKCno/Sj8=", "ref": "refs/heads/main", - "rev": "3a56d7bba5fa2ca562ab5288f8799339cdc947e3", - "revCount": 286, + "rev": "1dc5c105df7ba80643b596d3de025a28871aba2c", + "revCount": 287, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 5fd9e297b051d57ea88a519d61a1a21be06befc2 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 20 Jun 2025 11:17:16 +0100 Subject: [PATCH 072/107] fix: had used the wrong interface --- machines/agentjones.nix | 2 +- machines/neuromancer.nix | 2 +- machines/vendetta.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/machines/agentjones.nix b/machines/agentjones.nix index 2c1ae09..f661104 100644 --- a/machines/agentjones.nix +++ b/machines/agentjones.nix @@ -21,7 +21,7 @@ Notes: Used to have Agent Smith as a partner but it died (Ironically) ip = ip_pub; name = name; hostname = hostname; - interface = "en01"; + interface = "eno1"; }; in { imports = [ diff --git a/machines/neuromancer.nix b/machines/neuromancer.nix index 7068310..ed49d06 100644 --- a/machines/neuromancer.nix +++ b/machines/neuromancer.nix @@ -22,7 +22,7 @@ Notes: ip = ip_pub; name = name; hostname = hostname; - interface = "en01"; + interface = "eno1"; }; in { imports = [ diff --git a/machines/vendetta.nix b/machines/vendetta.nix index faea1a5..1113ab7 100644 --- a/machines/vendetta.nix +++ b/machines/vendetta.nix @@ -23,7 +23,7 @@ Notes: Using the server that used to be called Earth name = name; hostname = hostname; # only required for physical servers - interface = "en01"; + interface = "eno1"; }; in { imports = [ From af2613feaabeb2712d0894e16ef9098e93c7777d Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 20 Jun 2025 11:18:30 +0100 Subject: [PATCH 073/107] feat: create a password so michenes can eb physically logged into --- machines/_base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/_base.nix b/machines/_base.nix index 44dfadd..857e458 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -73,7 +73,7 @@ in { }; users.users.root = { - initialHashedPassword = ""; + initialHashedPassword = "$y$j9T$lf/Z1Db.lAXan2WN/YQEF.$ILMN5CK4eImzrioB04D.VgD7wrV2rwUjcTi..WE5ea6"; openssh.authorizedKeys.keys = [ # no obligation to have name attached to keys From fc1e1c5806c740497ab5ae9de8a7162e6d1a40a9 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 20 Jun 2025 11:19:13 +0100 Subject: [PATCH 074/107] Revert "temp: temp switch the dns servers since the recent changes left them unavailable" This reverts commit 4fc1071225184d9ca2e74a04a2a9d54674a1a4aa. --- machines/vendetta.nix | 2 +- machines/vigil.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/machines/vendetta.nix b/machines/vendetta.nix index 1113ab7..3244ba6 100644 --- a/machines/vendetta.nix +++ b/machines/vendetta.nix @@ -45,7 +45,7 @@ in { server = { enable = true; # primary dns server (ns1) - primary = false; + primary = true; ip = ip_pub; }; }; diff --git a/machines/vigil.nix b/machines/vigil.nix index 78527fd..421ebaa 100644 --- a/machines/vigil.nix +++ b/machines/vigil.nix @@ -41,7 +41,7 @@ in { server = { enable = true; # secondary dns server (ns2) - primary = true; + primary = false; ip = ip_pub; }; }; From 1823ae396f7c50095ab6c5ff690eb7ba89f7f8ee Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 20 Jun 2025 11:20:50 +0100 Subject: [PATCH 075/107] feat: more agressive recovery of storage --- machines/_base.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/machines/_base.nix b/machines/_base.nix index 857e458..36c087b 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -58,10 +58,10 @@ in { # options = "--delete-older-than 30d"; # }; - # to free up to 10GiB whenever there is less than 1GiB left + # to free up to 100GiB whenever there is less than 10GiB left extraOptions = '' - min-free = ${toString (1024 * 1024 * 1024)} - max-free = ${toString (1024 * 1024 * 1024 * 10)} + min-free = ${toString (1024 * 1024 * 1024 * 10)} + max-free = ${toString (1024 * 1024 * 1024 * 100)} ''; }; From d7e1e44f1be6dae31749a9d560293583376a9ed4 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 23 Jun 2025 23:22:09 +0000 Subject: [PATCH 076/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 0274176..a97a824 100644 --- a/flake.lock +++ b/flake.lock @@ -1061,11 +1061,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1750215424, - "narHash": "sha256-vpvSJIa8q5NPup0dkG3GFtW6lgqasVZ1KOuKCno/Sj8=", + "lastModified": 1750720601, + "narHash": "sha256-NDYXjqGEOXfge1kMd/4W5PdHz9HjZuAF2ssOsVYRmkM=", "ref": "refs/heads/main", - "rev": "1dc5c105df7ba80643b596d3de025a28871aba2c", - "revCount": 287, + "rev": "d27befdac6927c686d4bf96e05e6f677f477c79a", + "revCount": 289, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 017d383d0887bd9df98b1df5008cb7ee23f5fe31 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 24 Jun 2025 00:37:08 +0100 Subject: [PATCH 077/107] fix: recovering space was too agressive --- machines/_base.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/machines/_base.nix b/machines/_base.nix index 36c087b..555666e 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -58,9 +58,9 @@ in { # options = "--delete-older-than 30d"; # }; - # to free up to 100GiB whenever there is less than 10GiB left + # to free up to 100GiB whenever there is less than 1GiB left extraOptions = '' - min-free = ${toString (1024 * 1024 * 1024 * 10)} + min-free = ${toString (1024 * 1024 * 1024 * 1)} max-free = ${toString (1024 * 1024 * 1024 * 100)} ''; }; From 319522e4d37501bfd21537962361b54d674ee635 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 24 Jun 2025 01:24:52 +0100 Subject: [PATCH 078/107] feat: properly set a root user password for physical access --- machines/_base.nix | 30 ++++++++++++++++++------------ secrets/base/root_pass.age | Bin 0 -> 2849 bytes secrets/secrets.nix | 1 + 3 files changed, 19 insertions(+), 12 deletions(-) create mode 100644 secrets/base/root_pass.age diff --git a/machines/_base.nix b/machines/_base.nix index 555666e..84abb5c 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -41,6 +41,8 @@ in { manageHostName = true; }; + age.secrets.root_pw.file = ../secrets/base/root_pass.age; + nix = { settings = { # flakes are essensial @@ -72,23 +74,27 @@ in { settings.PermitRootLogin = "prohibit-password"; }; - users.users.root = { - initialHashedPassword = "$y$j9T$lf/Z1Db.lAXan2WN/YQEF.$ILMN5CK4eImzrioB04D.VgD7wrV2rwUjcTi..WE5ea6"; + users = { + mutableUsers = false; - openssh.authorizedKeys.keys = [ - # no obligation to have name attached to keys + users.root = { + hashedPasswordFile = config.age.secrets.root_pw.path; - # Root account - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK6DjXTAxesXpQ65l659iAjzEb6VpRaWKSg4AXxifPw9 Skynet Admin" + openssh.authorizedKeys.keys = [ + # no obligation to have name attached to keys - # CI/CD key - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBDvexq/JjsMqL0G5P38klzoOkHs3IRyXYO1luEJuB5R colmena_key" + # Root account + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK6DjXTAxesXpQ65l659iAjzEb6VpRaWKSg4AXxifPw9 Skynet Admin" - # Brendan Golden - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEHNLroAjCVR9Tx382cqdxPZ5KY32r/yoQH1mgsYNqpm Silver_Laptop_WSL_Deb" + # CI/CD key + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBDvexq/JjsMqL0G5P38klzoOkHs3IRyXYO1luEJuB5R colmena_key" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKjaKI97NY7bki07kxAvo95196NXCaMvI1Dx7dMW05Q1 thenobrainer" - ]; + # Brendan Golden + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEHNLroAjCVR9Tx382cqdxPZ5KY32r/yoQH1mgsYNqpm Silver_Laptop_WSL_Deb" + + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKjaKI97NY7bki07kxAvo95196NXCaMvI1Dx7dMW05Q1 thenobrainer" + ]; + }; }; # skynet-admin-linux will always be added, individual servers can override the groups option diff --git a/secrets/base/root_pass.age b/secrets/base/root_pass.age new file mode 100644 index 0000000000000000000000000000000000000000..2313336437c6050b924be3bcd8aa192dcf6d1356 GIT binary patch literal 2849 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 literal 0 HcmV?d00001 diff --git a/secrets/secrets.nix b/secrets/secrets.nix index db5670f..5321af2 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -105,6 +105,7 @@ let ]; in { # nix run github:ryantm/agenix -- -e secret1.age + "base/root_pass.age".publicKeys = users ++ systems; "dns_certs.secret.age".publicKeys = users ++ systems; "dns_dnskeys.conf.age".publicKeys = users ++ dns; From 4061e143f0e52400bf1cb84dfa522e7045e63035 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Sun, 29 Jun 2025 22:17:15 +0000 Subject: [PATCH 079/107] Updated flake for skynet_ldap_backend --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index a97a824..75e9573 100644 --- a/flake.lock +++ b/flake.lock @@ -1082,11 +1082,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1745459480, - "narHash": "sha256-ER4nCZQrbTmeRE+P+xm1T9GjBf4YvgeTMrOMGandmkE=", + "lastModified": 1751234352, + "narHash": "sha256-OeNGbd3kn2jjJq9nbNcLq7wquc8leOyWkahuWopKnv4=", "ref": "refs/heads/main", - "rev": "b714571b85bcd80600c743d3da4c840ff83adb86", - "revCount": 247, + "rev": "1dae2ecb2623d55c88a237d55198efd51e0fd8fe", + "revCount": 249, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/ldap_backend" }, From 4b3cf6c22e84076e90a16934bbf463cb1baf23e6 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 1 Jul 2025 17:01:34 +0100 Subject: [PATCH 080/107] [skip ci] feat: added teh logging bot --- applications/discord_t-800.nix | 32 ++++ flake.lock | 292 +++++++++++++++++++++++---------- flake.nix | 1 + machines/kitt.nix | 4 + secrets/discord/t-800.age | Bin 0 -> 1538 bytes secrets/secrets.nix | 1 + 6 files changed, 244 insertions(+), 86 deletions(-) create mode 100644 applications/discord_t-800.nix create mode 100644 secrets/discord/t-800.age diff --git a/applications/discord_t-800.nix b/applications/discord_t-800.nix new file mode 100644 index 0000000..cad630a --- /dev/null +++ b/applications/discord_t-800.nix @@ -0,0 +1,32 @@ +{ + config, + pkgs, + lib, + inputs, + ... +}: +with lib; let + name = "discord_bot_t-800"; + cfg = config.services.skynet."${name}"; +in { + imports = [ + inputs.skynet_discord_bot_t-800.nixosModule."x86_64-linux" + ]; + + options.services.skynet."${name}" = { + enable = mkEnableOption "Logging Bot"; + }; + + config = mkIf cfg.enable { + #backups = [ "/etc/silver_ul_ical/database.db" ]; + + age.secrets.discord_t-800_details.file = ../secrets/discord/t-800.age; + + # this is what was imported + services.skynet_discord_bot_t-800 = { + enable = true; + + env = config.age.secrets.discord_t-800_details.path; + }; + }; +} diff --git a/flake.lock b/flake.lock index 75e9573..f719ece 100644 --- a/flake.lock +++ b/flake.lock @@ -47,7 +47,7 @@ "inputs": { "fenix": "fenix_2", "flakeCompat": "flakeCompat_2", - "nixpkgs": "nixpkgs_23" + "nixpkgs": "nixpkgs_25" }, "locked": { "lastModified": 1719514321, @@ -537,6 +537,24 @@ "inputs": { "nixpkgs": "nixpkgs_11" }, + "locked": { + "lastModified": 1745925850, + "narHash": "sha256-cyAAMal0aPrlb1NgzMxZqeN1mAJ2pJseDhm2m6Um8T0=", + "owner": "nix-community", + "repo": "naersk", + "rev": "38bc60bbc157ae266d4a0c96671c6c742ee17a5f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, + "naersk_4": { + "inputs": { + "nixpkgs": "nixpkgs_13" + }, "locked": { "lastModified": 1739824009, "narHash": "sha256-fcNrCMUWVLMG3gKC5M9CBqVOAnJtyRvGPxptQFl5mVg=", @@ -621,6 +639,22 @@ } }, "nixpkgs-mozilla_2": { + "flake": false, + "locked": { + "lastModified": 1744624473, + "narHash": "sha256-S6zT/w5SyAkJ//dYdjbrXgm+6Vkd/k7qqUl4WgZ6jjk=", + "owner": "mozilla", + "repo": "nixpkgs-mozilla", + "rev": "2292d4b35aa854e312ad2e95c4bb5c293656f21a", + "type": "github" + }, + "original": { + "owner": "mozilla", + "repo": "nixpkgs-mozilla", + "type": "github" + } + }, + "nixpkgs-mozilla_3": { "flake": false, "locked": { "lastModified": 1740762144, @@ -652,6 +686,37 @@ } }, "nixpkgs_11": { + "locked": { + "lastModified": 1750731501, + "narHash": "sha256-Ah4qq+SbwMaGkuXCibyg+Fwn00el4KmI3XFX6htfDuk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "69dfebb3d175bde602f612915c5576a41b18486b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { + "locked": { + "lastModified": 1750506804, + "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4206c4cb56751df534751b058295ea61357bbbaa", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_13": { "locked": { "lastModified": 1741462378, "narHash": "sha256-ZF3YOjq+vTcH51S+qWa1oGA9FgmdJ67nTNPG2OIlXDc=", @@ -665,7 +730,7 @@ "type": "indirect" } }, - "nixpkgs_12": { + "nixpkgs_14": { "locked": { "lastModified": 1741513245, "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", @@ -680,7 +745,7 @@ "type": "indirect" } }, - "nixpkgs_13": { + "nixpkgs_15": { "locked": { "lastModified": 1687274257, "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", @@ -694,7 +759,7 @@ "type": "indirect" } }, - "nixpkgs_14": { + "nixpkgs_16": { "locked": { "lastModified": 1724114134, "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", @@ -708,34 +773,6 @@ "type": "indirect" } }, - "nixpkgs_15": { - "locked": { - "lastModified": 1741037377, - "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "02032da4af073d0f6110540c8677f16d4be0117f", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_16": { - "locked": { - "lastModified": 1741037377, - "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "02032da4af073d0f6110540c8677f16d4be0117f", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_17": { "locked": { "lastModified": 1741037377, @@ -752,11 +789,11 @@ }, "nixpkgs_18": { "locked": { - "lastModified": 1690026219, - "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", "type": "github" }, "original": { @@ -766,11 +803,11 @@ }, "nixpkgs_19": { "locked": { - "lastModified": 1724114134, - "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f02fa2f654c7bcc45f0e815c29d093da7f1245b4", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", "type": "github" }, "original": { @@ -796,11 +833,11 @@ }, "nixpkgs_20": { "locked": { - "lastModified": 1689935543, - "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "lastModified": 1690026219, + "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", "type": "github" }, "original": { @@ -823,6 +860,34 @@ } }, "nixpkgs_22": { + "locked": { + "lastModified": 1689935543, + "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_23": { + "locked": { + "lastModified": 1724114134, + "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f02fa2f654c7bcc45f0e815c29d093da7f1245b4", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_24": { "locked": { "lastModified": 1695978539, "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", @@ -836,7 +901,7 @@ "type": "indirect" } }, - "nixpkgs_23": { + "nixpkgs_25": { "locked": { "lastModified": 1668226844, "narHash": "sha256-G/S4FBWDAqHeBS/hfXwUCJbnaKnrQFoeeKwzvZEOgxM=", @@ -852,7 +917,7 @@ "type": "github" } }, - "nixpkgs_24": { + "nixpkgs_26": { "locked": { "lastModified": 1724395761, "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", @@ -981,6 +1046,7 @@ "nixpkgs": "nixpkgs_8", "simple-nixos-mailserver": "simple-nixos-mailserver", "skynet_discord_bot": "skynet_discord_bot", + "skynet_discord_bot_t-800": "skynet_discord_bot_t-800", "skynet_ldap_backend": "skynet_ldap_backend", "skynet_ldap_frontend": "skynet_ldap_frontend", "skynet_website": "skynet_website", @@ -1074,13 +1140,34 @@ "url": "https://forgejo.skynet.ie/Skynet/discord-bot" } }, - "skynet_ldap_backend": { + "skynet_discord_bot_t-800": { "inputs": { "naersk": "naersk_3", "nixpkgs": "nixpkgs_12", "nixpkgs-mozilla": "nixpkgs-mozilla_2", "utils": "utils_4" }, + "locked": { + "lastModified": 1751383566, + "narHash": "sha256-MchpwkTBUlpa8Spj8UJbvPPW1TOaAtffsraQQSJ4a58=", + "ref": "refs/heads/main", + "rev": "4fe416b9e7280d02e6ecc4b5e77c95b8d218f419", + "revCount": 23, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/discord-bot-t-800" + }, + "original": { + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/discord-bot-t-800" + } + }, + "skynet_ldap_backend": { + "inputs": { + "naersk": "naersk_4", + "nixpkgs": "nixpkgs_14", + "nixpkgs-mozilla": "nixpkgs-mozilla_3", + "utils": "utils_5" + }, "locked": { "lastModified": 1751234352, "narHash": "sha256-OeNGbd3kn2jjJq9nbNcLq7wquc8leOyWkahuWopKnv4=", @@ -1097,8 +1184,8 @@ }, "skynet_ldap_frontend": { "inputs": { - "nixpkgs": "nixpkgs_13", - "utils": "utils_5" + "nixpkgs": "nixpkgs_15", + "utils": "utils_6" }, "locked": { "lastModified": 1727122070, @@ -1116,8 +1203,8 @@ }, "skynet_website": { "inputs": { - "nixpkgs": "nixpkgs_14", - "utils": "utils_6" + "nixpkgs": "nixpkgs_16", + "utils": "utils_7" }, "locked": { "lastModified": 1732375016, @@ -1135,8 +1222,8 @@ }, "skynet_website_1996": { "inputs": { - "nixpkgs": "nixpkgs_15", - "utils": "utils_7" + "nixpkgs": "nixpkgs_17", + "utils": "utils_8" }, "locked": { "lastModified": 1744118392, @@ -1154,8 +1241,8 @@ }, "skynet_website_2003": { "inputs": { - "nixpkgs": "nixpkgs_16", - "utils": "utils_8" + "nixpkgs": "nixpkgs_18", + "utils": "utils_9" }, "locked": { "lastModified": 1743721206, @@ -1173,8 +1260,8 @@ }, "skynet_website_2006": { "inputs": { - "nixpkgs": "nixpkgs_17", - "utils": "utils_9" + "nixpkgs": "nixpkgs_19", + "utils": "utils_10" }, "locked": { "lastModified": 1743715699, @@ -1192,8 +1279,8 @@ }, "skynet_website_2016": { "inputs": { - "nixpkgs": "nixpkgs_18", - "utils": "utils_10" + "nixpkgs": "nixpkgs_20", + "utils": "utils_11" }, "locked": { "lastModified": 1743722645, @@ -1211,8 +1298,8 @@ }, "skynet_website_2022": { "inputs": { - "nixpkgs": "nixpkgs_19", - "utils": "utils_11" + "nixpkgs": "nixpkgs_21", + "utils": "utils_12" }, "locked": { "lastModified": 1743727062, @@ -1232,8 +1319,8 @@ }, "skynet_website_2023": { "inputs": { - "nixpkgs": "nixpkgs_20", - "utils": "utils_12" + "nixpkgs": "nixpkgs_22", + "utils": "utils_13" }, "locked": { "lastModified": 1696876711, @@ -1253,8 +1340,8 @@ }, "skynet_website_2024": { "inputs": { - "nixpkgs": "nixpkgs_21", - "utils": "utils_13" + "nixpkgs": "nixpkgs_23", + "utils": "utils_14" }, "locked": { "lastModified": 1732375016, @@ -1274,8 +1361,8 @@ }, "skynet_website_games": { "inputs": { - "nixpkgs": "nixpkgs_22", - "utils": "utils_14" + "nixpkgs": "nixpkgs_24", + "utils": "utils_15" }, "locked": { "lastModified": 1727122069, @@ -1294,8 +1381,8 @@ "skynet_website_wiki": { "inputs": { "alejandra": "alejandra_2", - "nixpkgs": "nixpkgs_24", - "utils": "utils_15" + "nixpkgs": "nixpkgs_26", + "utils": "utils_16" }, "locked": { "lastModified": 1745466454, @@ -1477,6 +1564,21 @@ "type": "github" } }, + "systems_19": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1620,11 +1722,11 @@ "systems": "systems_13" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -1637,6 +1739,24 @@ "inputs": { "systems": "systems_14" }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_12": { + "inputs": { + "systems": "systems_15" + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -1651,9 +1771,9 @@ "type": "github" } }, - "utils_12": { + "utils_13": { "inputs": { - "systems": "systems_15" + "systems": "systems_16" }, "locked": { "lastModified": 1689068808, @@ -1669,9 +1789,9 @@ "type": "github" } }, - "utils_13": { + "utils_14": { "inputs": { - "systems": "systems_16" + "systems": "systems_17" }, "locked": { "lastModified": 1710146030, @@ -1687,9 +1807,9 @@ "type": "github" } }, - "utils_14": { + "utils_15": { "inputs": { - "systems": "systems_17" + "systems": "systems_18" }, "locked": { "lastModified": 1694529238, @@ -1705,9 +1825,9 @@ "type": "github" } }, - "utils_15": { + "utils_16": { "inputs": { - "systems": "systems_18" + "systems": "systems_19" }, "locked": { "lastModified": 1710146030, @@ -1782,11 +1902,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1687171271, - "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -1800,11 +1920,11 @@ "systems": "systems_9" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1687171271, + "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", "type": "github" }, "original": { @@ -1818,11 +1938,11 @@ "systems": "systems_10" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 034dd7b..f63e7c8 100644 --- a/flake.nix +++ b/flake.nix @@ -37,6 +37,7 @@ skynet_website_wiki.url = "git+https://forgejo.skynet.ie/Skynet/wiki"; skynet_website_games.url = "git+https://forgejo.skynet.ie/Skynet/website_games"; skynet_discord_bot.url = "git+https://forgejo.skynet.ie/Skynet/discord-bot"; + skynet_discord_bot_t-800.url = "git+https://forgejo.skynet.ie/Skynet/discord-bot-t-800"; # for testing a local build # skynet_discord_bot.url = "git+file:/_college/CompSoc/Skynet/discord_bot?shallow=1"; diff --git a/machines/kitt.nix b/machines/kitt.nix index 93298ac..35600c8 100644 --- a/machines/kitt.nix +++ b/machines/kitt.nix @@ -29,6 +29,7 @@ in { ../applications/ldap/server.nix ../applications/ldap/backend.nix ../applications/discord.nix + ../applications/discord_t-800.nix ../applications/bitwarden/vaultwarden.nix ../applications/bitwarden/bitwarden_sync.nix ../applications/sso.nix @@ -53,6 +54,9 @@ in { # private member services discord_bot.enable = true; + # for logging on our own discord + discord_bot_t-800.enable = true; + # committee/admin services vaultwarden.enable = true; diff --git a/secrets/discord/t-800.age b/secrets/discord/t-800.age new file mode 100644 index 0000000000000000000000000000000000000000..496116149eda9783e6a21436482a21f0255f16fa GIT binary patch literal 1538 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5w{*E76Zk zvk34?H#Lq-%g!;)^7HVEGB-|7^YchI4k``wGBXeGHHdU}i{#4ijBxVtO3XAWEl+eQ zj;N{(PjxcN2(>iMOe`sMGO!HK@D8X*FZ3ub$VRu#B%mrPKV88~-$}dD*uv5;CoIw+ zG~3s=BG)oG#XL9CGB7eszfixVu-w!qz}Y>^!-Ol})ga5zH!#xF!dc%d%+f2O&@I!r z#K<(jC^E+>)Y-y3HPI|8sJJN2+ZElm6i0)ypmc=-mkfVr%is`?6w81jL%$$5H}^a* z*Ie(yBuDr1GLK?oqX74CpWM=*N>?t6iolA%LlRvx(+cvkoD4k-vcjBGGLmz$&2kb$wX=$} zLwzgCoy{vsd`$DRjgq;-D)YRuEu38a@*~X6T@y=<%iaC;1N}U`UCc{7U0n>y-Q9Bx zTtXcS3i8oyE3`=UN>5iX3UCgp2+Z;hbj!&!_A?5}%y%lNbj*$Nj&e`(F^LE?bPX}{ zN%AvJHn8BTDl$&>$_w%|j_@xHj54&0GBF6uO)CjCaVn20O!m^YEb??qG7BrwFEBv2 z%{#2fqNrTKG{U_&-y+f5(%;y^FVWpN$~nq3CELp=$}7bnF(o&-)U=?|yU5McBO;J1 z-`vu#wA|Fv$;;5oGSb5%$D%5@szN)eIMge|**_`YBGNh7!Z9;^Q?08Ep$|f@^UjPFZ1-Q z^iDT)3U)3?EYI~1^foOhN~ww{_6V;s_4IPFG))S0aSG)sGOh}U406%VH4Ci>EzK=S zD-E*DHcCs&G&gcG^h-?1)=$bUbqV#()i37K)zwwV^a#{X$;)v|@-+1^FVFJJj0#IK zs4_JQ3NzNP$g8RhGP3k4_wg??Eez%Ak*M^H-r5uy(9mM>)$_dDdPbAbeXKikrq=)V z?zdps6L8vd(V}k?j5{(VwLfdG6>xh|rg+B6{K?zT3SV^ zYmd}Fjh)rIR9>g&xbWY-#MUF_u}$*L(SK*&GrbSvyZVJ;`}4cb|6jGohTr84lk+VX zv#vPvWscgtqd`2Hf}exymWO@b@pSWD4zHY3X0Jp`-szY(`p@6FQ^#^H?`dwU$yyOg zQF|tT;_XlCVmNny-QuglKR;=x9Xhh)cJ#VsKfSektBjsJG2{FrDSgXYb^GGTlqHR& z5&MhEyVmv}PiA$n{J-!8ho_iIP4}tWAI-COEHwX?cFbP!dK90Szs%{2e?Keuul~_- z@8Ge7!~{FOXU{StidG5D+ Date: Tue, 1 Jul 2025 16:21:18 +0000 Subject: [PATCH 081/107] Updated flake for skynet_discord_bot_t-800 --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index f719ece..61cc024 100644 --- a/flake.lock +++ b/flake.lock @@ -1148,11 +1148,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1751383566, - "narHash": "sha256-MchpwkTBUlpa8Spj8UJbvPPW1TOaAtffsraQQSJ4a58=", + "lastModified": 1751386095, + "narHash": "sha256-LKo+rvR6/rXJwDQJXU+McooE+8PQF8F5ARAYplLG3oM=", "ref": "refs/heads/main", - "rev": "4fe416b9e7280d02e6ecc4b5e77c95b8d218f419", - "revCount": 23, + "rev": "9d26d8f159ca391380f672fba29f9c90151e1793", + "revCount": 25, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot-t-800" }, From 6ae308007f4a337803629d496f1017e66e10c8cf Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Tue, 1 Jul 2025 16:25:54 +0000 Subject: [PATCH 082/107] Updated flake for skynet_discord_bot_t-800 --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 61cc024..3a63ce8 100644 --- a/flake.lock +++ b/flake.lock @@ -1148,11 +1148,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1751386095, - "narHash": "sha256-LKo+rvR6/rXJwDQJXU+McooE+8PQF8F5ARAYplLG3oM=", + "lastModified": 1751386942, + "narHash": "sha256-3byZajmYDFvOOHlp/QQwu8cCXdpJ9WEWAm92Nlnm+rM=", "ref": "refs/heads/main", - "rev": "9d26d8f159ca391380f672fba29f9c90151e1793", - "revCount": 25, + "rev": "6171e1d2e1b04a1b632c577f94df581780b1d574", + "revCount": 26, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot-t-800" }, From 3085a3a5a40a0290106fa669603fb0c47e004b2a Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Tue, 1 Jul 2025 19:16:49 +0000 Subject: [PATCH 083/107] Updated flake for skynet_discord_bot_t-800 --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 3a63ce8..fe97196 100644 --- a/flake.lock +++ b/flake.lock @@ -1148,11 +1148,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1751386942, - "narHash": "sha256-3byZajmYDFvOOHlp/QQwu8cCXdpJ9WEWAm92Nlnm+rM=", + "lastModified": 1751397287, + "narHash": "sha256-9G1T1nJS6itGsUhZxr8e1KDIx1naTSO916QN0HyCwRw=", "ref": "refs/heads/main", - "rev": "6171e1d2e1b04a1b632c577f94df581780b1d574", - "revCount": 26, + "rev": "b26a7c23678fb7ad922e4b7f28330182d0e6844b", + "revCount": 27, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot-t-800" }, From 8a8a1a3c7f22b1559b948baa1b733393862273d9 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 3 Jul 2025 14:35:37 +0100 Subject: [PATCH 084/107] feat: updated nixpkgs and lix --- flake.lock | 26 +++++++++++++------------- flake.nix | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index fe97196..6ebf952 100644 --- a/flake.lock +++ b/flake.lock @@ -467,15 +467,15 @@ "lix": { "flake": false, "locked": { - "lastModified": 1746827285, - "narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=", - "rev": "47aad376c87e2e65967f17099277428e4b3f8e5a", + "lastModified": 1751235704, + "narHash": "sha256-Jzm3KPZ2gL+0Nl3Mw/2E0B3vqDDi1Xt5+9VCXghUDZ8=", + "rev": "f3a7bbe5f8d1a8504ddb6362d50106904523e440", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f3a7bbe5f8d1a8504ddb6362d50106904523e440.tar.gz?rev=f3a7bbe5f8d1a8504ddb6362d50106904523e440" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz" } }, "lix-module": { @@ -486,15 +486,15 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1746838955, - "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=", - "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc", + "lastModified": 1751240025, + "narHash": "sha256-SXUAlxpjPRkArRMHy5+Hdi+PiC+ND9yzzIjiaHmTvQU=", + "rev": "8b1094356f4723d6e89d3f8a95b333ee16d9ab02", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/8b1094356f4723d6e89d3f8a95b333ee16d9ab02.tar.gz?rev=8b1094356f4723d6e89d3f8a95b333ee16d9ab02" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz" } }, "naersk": { @@ -1007,11 +1007,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f63e7c8..3ff66a7 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ # nixpkgs.url = "nixpkgs/nixos-unstable"; lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz"; # inputs.nixpkgs.follows = "nixpkgs"; }; From a2000ec6da816e3d889f22ead7c5d717d10b9447 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 3 Jul 2025 14:40:36 +0100 Subject: [PATCH 085/107] fix: force using our nameservers --- machines/_base.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/machines/_base.nix b/machines/_base.nix index 84abb5c..dafb0fc 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -104,6 +104,8 @@ in { # every sever needs to be accessable over ssh for admin use at least firewall.allowedTCPPorts = [22]; + resolvconf.useLocalResolver = false; + resolvconf.extraConfig = "name_servers='193.1.99.120 193.1.99.109'"; # explisitly stating this is good defaultGateway = { address = "193.1.99.65"; From 183fc70d03699068fddaad74cc7acaf2ab7d2fe9 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Sat, 5 Jul 2025 14:37:35 +0000 Subject: [PATCH 086/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 6ebf952..a177edb 100644 --- a/flake.lock +++ b/flake.lock @@ -1127,11 +1127,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1750720601, - "narHash": "sha256-NDYXjqGEOXfge1kMd/4W5PdHz9HjZuAF2ssOsVYRmkM=", + "lastModified": 1751725913, + "narHash": "sha256-7/hUVgjLRZH2ZcFErIb4GuUGKGknKm4605hiOhJRRaI=", "ref": "refs/heads/main", - "rev": "d27befdac6927c686d4bf96e05e6f677f477c79a", - "revCount": 289, + "rev": "c4da3e91096741dc827f3a5ac3c184160b8f1e8c", + "revCount": 290, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 96a7af86cbfa16d5a418a2b6dff0fa373181ce6a Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 6 Jul 2025 21:45:09 +0100 Subject: [PATCH 087/107] feat: add esy to the admin list --- machines/_base.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/machines/_base.nix b/machines/_base.nix index dafb0fc..d824939 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -93,6 +93,8 @@ in { "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEHNLroAjCVR9Tx382cqdxPZ5KY32r/yoQH1mgsYNqpm Silver_Laptop_WSL_Deb" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKjaKI97NY7bki07kxAvo95196NXCaMvI1Dx7dMW05Q1 thenobrainer" + + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDxHpsApRyCvuP2ToGm46G308Og8lO7BYPuz+EqHVU5w esy root" ]; }; }; From 17d69245a54f4dc5853374ee64804a16039d6f9c Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 6 Jul 2025 21:52:29 +0100 Subject: [PATCH 088/107] [skip ci] test: added esy's root key to test if it works --- secrets/backup/restic.age | Bin 2870 -> 2980 bytes secrets/backup/restic_pw.age | 39 ++++++++++---------- secrets/base/root_pass.age | Bin 2849 -> 2959 bytes secrets/bitwarden/details.age | Bin 1155 -> 1265 bytes secrets/bitwarden/id.age | 38 ++++++++++---------- secrets/bitwarden/secret.age | Bin 1012 -> 1122 bytes secrets/discord/t-800.age | Bin 1538 -> 1648 bytes secrets/discord/token.age | Bin 1204 -> 1314 bytes secrets/dns_certs.secret.age | Bin 2924 -> 3034 bytes secrets/dns_dnskeys.conf.age | Bin 1204 -> 1314 bytes secrets/email/details.age | 53 +++++++++++++++------------- secrets/forgejo/runners/ssh.age | Bin 1491 -> 1601 bytes secrets/forgejo/runners/token1.age | 43 +++++++++++----------- secrets/forgejo/runners/token2.age | 42 +++++++++++----------- secrets/gitlab/db_pw.age | Bin 1111 -> 1221 bytes secrets/gitlab/ldap_pw.age | 40 +++++++++++---------- secrets/gitlab/pw.age | Bin 1111 -> 1221 bytes secrets/gitlab/runners/runner01.age | Bin 1175 -> 1285 bytes secrets/gitlab/runners/runner02.age | Bin 1175 -> 1285 bytes secrets/gitlab/secrets_db.age | Bin 1111 -> 1221 bytes secrets/gitlab/secrets_jws.age | Bin 2660 -> 2770 bytes secrets/gitlab/secrets_otp.age | Bin 1110 -> 1220 bytes secrets/gitlab/secrets_secret.age | Bin 1110 -> 1220 bytes secrets/grafana/pw.age | 38 ++++++++++---------- secrets/keycloak/pw.age | Bin 1024 -> 1134 bytes secrets/ldap/details.age | Bin 1637 -> 1747 bytes secrets/ldap/pw.age | 52 +++++++++++++-------------- secrets/nextcloud/pw.age | Bin 1024 -> 1134 bytes secrets/secrets.nix | 2 ++ secrets/stream_ulfm.age | Bin 3194 -> 3304 bytes secrets/wolves/details.age | Bin 2048 -> 2158 bytes 31 files changed, 181 insertions(+), 166 deletions(-) diff --git a/secrets/backup/restic.age b/secrets/backup/restic.age index 8f7c0425ea8ab0fe4651961ea1c328003fd1f320..00a5b352c4b76884b9e7cc035f3ca3b787e091e0 100644 GIT binary patch literal 2980 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5yYO4tMrV zwk-3>a4roEF19ptDsf42Np~wVH#K)HH7qqwHx4TmBg=v$5jCN;L9yHVx16aCIwlGY^ld3@<4uN>9u-E-UsjF^mi{PYnun zNlLFY3kl^i$g0fqO7@Nj@b{=H&G9X9DR<5_H%Up3NH6fy4~Pi#_R4eiEziyO2sS{s z%{#2fqNrTKBgE3ZQad9o+{oS4vC<{QxX{(v#Hlo_&@nPBFWAQ*#k1VVGbK2(GSrpJ zIMEj{*E!3yGz}vp(=rncQv((B z_5Hjflk+S*@{HUf4GfBl%uHP~z1_<*D^jx!f{b!4gG=JV zt1A7q^*xgdQ~b&kJ@X1oBHfHb)5|l$T*?jIf|5(pJ(4l}mTPVp<*1Mrp5kPd6Xs}9 zmQqrXmus2mn;ueR;g;`J;+z)hR#_6BTjXCH9^{?vp3bG678PRdAL46X;_e#Y>z`a^ zQ0SU&;$vZ8Qjuxq;^`Xcl3Q6EVwB^bSB!3(zI&2sdZ2=tYi?z5d0|GVmx)(qvZr5_ zxqf24shgvJdSpO$zEP30Uvg1sw!cq7ZX{P~rgMIxcTQoLxtEJiMp0T=L`hUwg;Tn( zVV1sWMUrD+Vpe6LX=Q#&1V(=IE6MTGcT@aCdQ@sjG`iXt;NTuS-&BGFL`=P)Js& zOPYCjpmvV8MY6Gbd2xEViHEjpT12LIvRQDrNqLcDx|vTdhTn`+i^4t16--0QJwp>M z1Eaz-N-~VH)3w9HUGvk614<$+jVuDpoReG%Lo3aEBC>N#xZEqfy$u7+vs3cRjngXw z3Jt0Xjl5jkLdwiNjE&7q5-Uud!jfHlv$ahy{8k!OF8lpo>yT}>S&ha z?p>AaYhIXGRZ(7H=4E7%k(cM166WKR>z|&?Wu)y|Z0Z{7VUcIyT^8!%n(Szi6`17b zX<1yASY(-HnOb3%~@HaBc%rh`B_K%44F!eRIG>bHKE6VXp z^bg4~LAT8#$sn^JP@%FiG|k<~B_ztHyuu^PIWNF0$Slb#F)^&f)!5Y2HN8A5B+J(& zs-iT)gsaTJHK4%D*E7k~B*@pSBq%SaAT2vTAUh>0Evl-_+|($m$X(kd$jHYh9o;tL zf*gJCas|(*lw8mBpiq~bQdb|(#Nsr=LgNVUvchtsU`z8%!%(BtV{5`Y_iqbuTi_4ueBN9uDLL%J*xeSfV%9H()f*h;D z0@E#1-HIa(-O^psiwwOA%QMT0%{=lg^Ml;{%Z=SJ>bFo=v$W(ug$Tb&)1Z9wkmQ0Y zlcFk1OTS8wpkg;){oKIBWNnLp3S+-uCv$iA{9wa$E{~83*RaG&qjF0pOA{Z{lEg?u zZ9m^iU&E-1q7qMk?X&<#AOC#Uil9u4c#CvPtZ+_ONJt%K%1UuJGPf+O@=Nn_F7vI@H#P9&iZXH3E)59t^T%7Rsc(?z?VVl`>|EjPQ{m!SY7|jy>FeTDV&IqP?P^%g zl^N+>R8mwD7?|kcSn2Cu>Fk_pR2AkP;Nj($otUF-tncq%;Z&TK8kJVgrK_u};OM1q zlI)Y^Zf25~=HZ>aV!d$<|X=@m> ze}|jDT^V~tr*_S@g17$)L)&LuWm*tCA-t$2rJG~I$@}NZQdIX_o_E}NWO9qTZmhkt z`1)TH-Dj_F^7FEhl9>H1o3VP2vW-_tAqQi5$|_f>=KP#j;e9P}+DlFTiS&JJvC!Rf zA%6v@zz+Vu4ihxwmQ`?g?Ni=2J1yhFB<*9u4vfAle6u)a#Icy4|8V`Ylkt%gC$!ai E05s#mr~m)} literal 2870 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5sZk%&iDF z$~W;U$ty7m)J`dJ2@Wm`%uF%O^(u{w@Jw?u(+{#ND7Em-wcyH1^mlVCaw`Z3Dk%&I z2`Y2(baE~>_74p*_6_mPHS_j23^DUf_b$jX2}HNeB%mrPKV2a=u*54kqRLr2%)}|G zFvH0xFs-=6$vHFF%d8@^Fgwu0skq$TCCfK6$bc&>!pF6$EYmo*G~LL}C)M2~%(*l& z$+Iv#)!#KIworG6Tiq}lgPvzgJiC}zzC19s`4za!i)lQe@}CZbhnDMNV80{oDBUk zSO0YPWbexC0?$J2Vn=k_O#M`n>{Rj-rstC-^GxW1e$_`F5NOK9!FiA4@uqe}aaq$XuFXnPA@rkGm4GKs~ zF*i3b4KOuz56*JV%=HN^%&RahtS~Alx6pQt%ytg&^+orazI&2sdZ0p8j=!&?ds0SO ze!01OnqyQ*Rgp=gpP^r9vSW(3NobC-hq0?!L`a}Pjw@GiWpajPWSMc6c4>i8NTG>= zU#hubnwfTbhGAl&NkN{kvx}u?g+ZxT2u3RLE6MTGcU1654lUP?tTZt2&NVR4O$_ob zO4Ltx3$gTY53=wz%@4^mFbN7aip&cLw%|%GbutceO{+8tHS}`JkMb&Z35fJ7$}&kQ z2`S79GIq*M&NOuMs;CIbH9+@UnNg&HrK5tMf4+r#NqJ>PVYo+HnRb$ivtguTl%Zc~ zW>UI;Sa6n`U#VekQBZ}SfiIVHYJo*Xxv8a#L8zm*Z?SVkuxGGysB4i~VMVb|Wk!TS zy0f;Uxq)AbAx0{R2rhCoD_008^7gGV@-;Vi&NC~sFewOh_fGfoi}Lr5Fia};O*1GB zH+Cuu3CpZ773J^ld zkZ+Xb99dYNQ|9L%WLD~)p5zheZIKe0E~+hoQ-ZAfteu| z7JUIi}Z?uCWnRi4RSe#ySBsgYIQZV_PxB^Hi`nMHv) zCVmB3nV6}hAV=T3T%n{;+qA4C)iBl6IUvj+T-zrw(=^#EqtGm{I5^7HJ2lO;z|=F# zGAt_Bm#e_VQrjdY+&e4CN88B9A|o|XJ0#!0Fvp;%IM*dT*~KHnH88R)vm`MeBi@1w zU7T_q71BI1ssgJFy-X_H^Nq8@$~}GEObbg33bhl>^~=IstFpo~vqF75(zPo+xhxB_ zN}c?pOd^siN=%GBon4)>(zSzKv&(YBEh8Nb-6~8?9Na%$$leeSL42(EN~q!gAw$^mvPOORR8CS15E1^UL-y_V>>z z&o>QE_X^QZag8X?OAPZ4_w^{MG)ZzX_sh0)&#bH{=PE1?iwtuO@=FYM@-MG&3`%he z%lFDDOExpm_ckpr&I@n~%k_!0h|u=Kuq`#m*)=s?p(@m}xGdjW-?PXkqcklq#U;C< z)Ga;3*e}r6!zDZen=BB?O3$fz=zE63l^-`zXQU%w=!pwu8YNk1>u-y|ubD&5;K zAi%^evmn(o++1JZEx!<>oU|y5vUCnq@OLVA5A-pN$_omquyitaObyC5PBJWT4E9ee zau4+?D)1}tF?F)gcX7|=(vQ&h_sq>KPfe^UNzVu{EAme)^{vRw^K{NCi!`z*a?dqM zH*+$L@DIW$Cp`;%T>Q%wjEW12vfVB6^NLfvk_}V+L&IGHGAs;2-OGz23`0UI{f!+f zoV80TEOP?63M|SZlTtI&qavz|Or3))tCHP3N>j~?f-8*uQ%elY+)6{!GJT6nO-c;7 zbaizV!jkigQw>}kL;R9*^YqPfEHYhFll9Zx42^ON@?A^{gUr0VqH?nRGLtR1`t|lr zU1w*A z{dOoxny&J6`;*l ssh-ed25519 V1pwNA mN/1o9VKKc+kBc0s2DEmjHJn6AUbCQUoaCsvswNHzUM -SlqlUx/Ok6lrc71g7uJYG4/Y+DG9nnumw0GsHtFH9Ao --> ssh-ed25519 4PzZog Hm/dzRXkAtX8iopSdsrRw0rIAKtagbRtS9zGnFZdjAk -dIhBGvUOUd7SgqADywQnnv/lggussXa+AxOdxI/gp4E --> ssh-ed25519 dA0vRg mP3xepL4DnV1V0sYrS8n5a9XFaY3HlYn88IjukBW2C4 -KpUv1UGZdzx3kHH8LlkqCIgGK9DAOZSyN+bLfaPABcU --> ssh-ed25519 5Nd93w E8tGoDN/aQoe9gmMkIWxB7vsgQ5fJ8WzjO6+NefmcXM -HY65eZHHm3GovuZoVgOMh8kveA1aaxyYBvXDMuw5Ry4 --> ssh-ed25519 q8eJgg j86zF1fq/TSyxl0CTlvnJw0MJVVtG03oqGDumyovogI -gNZY0eSlLIstaHlbY/6n44/BKaQITXqD8qNOJGotplI --> ssh-ed25519 KVr8rw 7T8vLuXcc0jrtvQTu/FU3ZZC963YkAizU5Q79OQEvxg -R9YC1AZsrJa6PZ0Vzum9TKCwFPd5EWJ4McJqtNgQQ34 --> ssh-ed25519 fia1eQ bzqIMpD3LmkKUPRZ8HibiqJDZfR2lIcMCICputpX2w0 -2TMqO/yxAMPB4b13/r6jBytD5lhbhauxTrmCx95w/4s --> ssh-ed25519 3pl/Kw 9qEhAIqJFP6XrMsT5ju8XQeG5dNG/U0/wTUiPYT7xHU -gT+zRjaAhAK/BUOZXAWNUq90F1I9T/y6qZuGRnbHroQ ---- QGGO/WedFvcHW4JxdpMHP1PbfaB1ITP4KVb5vWF3Kzc -Y@/ܻKhA@0K -.uq_9`, W%Tn`Cʯ÷1n3?ŹєǍV] \ No newline at end of file +-> ssh-ed25519 V1pwNA kWC0Tr0nlHEelEzS9xAzZ5UwI1vTgeaBS+zQJCxHe1A +dcVKgK28SA4abje/xfC2bqlDzrkThJh0hpsyCtfGPDM +-> ssh-ed25519 4PzZog H/hrMeDv4EmuSvR79vX7spZyF6t506ZKVHWHl4HN1wQ +E4+skv4K1fTqG1cIbRqRr89Ti6D78wxEzap3Sl0UZU8 +-> ssh-ed25519 dA0vRg SgmoRqftGwIG34Py02bfdEv2HlI6fPBiKmcBmz2VaiI +DKzlODXbQf9xzUzJHlwtIZbGw3qG2ApfssEF1/nZe+Q +-> ssh-ed25519 5Nd93w Q8fxVcYwxbeXJzpKCOWH4/D3t8bWSUm9E4spASzIKnQ +80fe2FiI+5OTojxu32OfFJwS3l/cMPr+5tErOr5wmcM +-> ssh-ed25519 q8eJgg zgw/JH1HOdTE38Cr/61gcGo6OruuFUCAUJ4wmNHSXWs +l7ta9JGOwCZCjnfui2Zo3PVF+Ge/UoPL0xm5lZ0GGF8 +-> ssh-ed25519 KVr8rw CcJymhaWM76X91C0ECPlZqaN2IARwxo1WMZRmlevnzA +syAw8YySWxtDonZ5txKVNynCdziInCzy4u5kv6mH8PU +-> ssh-ed25519 fia1eQ 0ocrOjhQ+CEJK8Li3rDegYkMXkBpjAAStjgvVHGQx3Q +YORVM3sEbE6PLVuwfMkxe9gYqTVVT7DGoG+kQcxaPiQ +-> ssh-ed25519 Km71ZA 9W2stpyr/9osFppfqBDjeDzZ6ltU+spmBoeWJ+I8sys +C6DGgwvbwW0r1E3L6o7LUOnPo/n8Sl8tGzm3NlsXGcw +-> ssh-ed25519 3pl/Kw pm1noozCEdPbd4f8rkSD/gicvfWTEN1kvYp7TLb68Uo +VH2XUbhIf4nYTmp6rkGt99RcI2xxa7F9QXmDp88r1CY +--- lNlQ5pwix455easITfJ8dztlPYg8Pi77sbAsOQF19dI +#@3|K%kxL,5x/QTbz j.7-]2b_>NJam^ C]Vvh|D̀" \ No newline at end of file diff --git a/secrets/base/root_pass.age b/secrets/base/root_pass.age index 2313336437c6050b924be3bcd8aa192dcf6d1356..92697682e737cb17a5bbdda6411e86a548f82acd 100644 GIT binary patch literal 2959 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5zJG^C*uj zuJ8{}O)E9fHgiu8b1cuSEDATxPER*BO)d-y4|8+M^|45)u;B8k40YEIcQiE4H7&>q z)-Nrx%yA9%N)7SNFSGCniF9@>D{?I|)DH;@4@9@kB%mrPKV2cU$UoQ5B`Va(vm(gd z(BG@HEU6@|%sV6^-?+@6Fv>*V)v2P$Dbvd{$dgOI#3MM*IU+JNF*!B7G&9S|-P6Q3 z+@i=WwJ^iaGu1r6&A&V}!qd_yHyhoy6i0)ypmc@MKm*GvH;eG{@bvKHurkkb|H$C% zGK=ES%!0xQgFGk8oD_e zEKI#B&63e=E3`=UN>5h^C`|Rqay2r_GjVk`w)83wE(`H@%l9ld334~eDKJeojS4Bx zG%zkn3(Dt;sL~HH4vNrr)-OtOElf2v2uksC&NXl~%1LzbcTe%iH>%XvPYI5+FfK;7 z%{#2fqNrRUP&=u-EKNJj*eu&JJ)^)q!=lP9CC|_~)zUD@t1>b%q9h>7JHRa2IVhhi zEz(!JB2qulxgfYKGC9d5*)1S1Ff|}M*rF_~D!3xDEXBPr)x$C()6)XowzSMd!_+{9 z^qlN0V~4YV@@jZN~xD$|O>GD}U%lZ%Tj)AEc$GJ{RH!o!V%j5Etj!cC)`D+)rq zy(=RELQPZ4eG2@tLX#t^l2e?#%>1$ zu1La2lM%s1j%MWwX4(N>Q2}o0{;8=>Cfbf+#TMqKWmUPwMLuao2DuicE;%77u70Mb zj;_Wua+qDG>n{W)YzU#@Z?6sZpj*rrsE7(l^7y zH_}nTAWT0nImOl3EZ3woAjP;Wys#|L(lE`_KRMagGbyV$CEwDbAjCK+J`FCJi?dw$Om||p-6{YX%Smu^*5fohE zRBY&KQey6#R+(E>QBoOTo)nVq5>bwBn{%Omh&QM2JygLOpQf`^+TV`mHn3wMu8sX_`oL?C37wG63Sx}Pd>2DMo=2@7T z;pCX_7KM=mJdzAD3j!5N!~If9%fl^7qkO9zlZ-N=0t$>P3_LtdJc2BXb3F6?aso13 z&C7jDjY7G?L(B>@y^5TR!jp_6JSxnS@D6AqhvC^o@Fufupvz#j+ z&)34c+~2Gq!qGR>EiApFEYdg4yD-o+(9|niJ5jqZx5&)fGQ7&M*bzP6f(u=oavc@C zwEYZIoeK<8D_kO+OG7NuGK#_@Ljt1G4KmY1lFUl;Gn4fbeacdE%9FXW1HG!elYN6d zD++TW0`+r>UBj|N%W@+!ohs6OOTB!`i_9wnE6c*XNN34D$-k%`~h?u1w7>H^_`K&NAV03d#x3)h}>y4fYN%@zU0= z$hRyk4oa*vFYpgc_VP3@$nexQ%J9<)!L zI3m?6B+4VqEHT8$)ilr~%hJuu%rVk9Kh%ON*C4$(r!3VwH8|V1Alxg=%r!kdT|Ya? zu_DROEik3PDAO-IH95*9(HO&TsX5NBsp$%dNr~D10S0-=&MB3KIUeo?j=@zHmi~F> zm1Tz6#yM%31!bn8DVA9|5f)tO2B8stVMRf{-o>stC0UMDflB| z7U@yNf!VpGUKqAnlto!O2P$|6o269+R-^`Im?wKD`*|BimPa~An1>|!2IZxcr(~uD zgqNC`>E{JiMRFAsXLxCQh9_sFlz0_+Mf$oq1tuCLW_tM;XNKvg1o=DXCsvr5I=O_K zV6?eB3w&Js%N4RK@{$~@60?K7U9vOXBf|_T^GqFmy!6Wq^pkS3a*cy?ode2}9epfA ze7XGcLVZh0%|eQd^Rf#vDkB5D5-al@Jq?@epPw0G5q&sY4{+>)Ge;;dov+1RJjEv1tZ*qgS$F2A^zG0k4`(y}vB%O@~IZPoat z$@f}Ee%YBxzwJ-7?B%{8t6sQ6V*kRuW~u+U#R|_JvQ3G1<&R(a``9DLPcKg}PHva~ l!^^Cw6h8Gp=1di)EoG-T;Gtzc>H@ literal 2849 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 diff --git a/secrets/bitwarden/details.age b/secrets/bitwarden/details.age index 4777128a8e12ba8668dd82eff7893033a22bc17a..173c7e3316722934efbf8f5cf25cae1839ecb2c6 100644 GIT binary patch literal 1265 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5y7*b@DVV zvkXcpbS-sv@iTQcDm5?9&@S=|DDudP3`i+XGpp1$_sPk~3*`#cH}ov7@OG~#E$}dQ z_cQf!F{yG5wXDdo2+XlecTUMnvGDbYFmo}ea74GwB%mrPKV6|H-ORnHvck|H%P(2q zBd5gJt31uc*f=ybup~d*D6up*#3(y5Br(Jy(16RR$h@S;$IT?y%%eQfB-}s1Jjoz8 z(k-PtKs(hb%&97{&^XyVP~XfgFB#po6i0)ypmYV#h^#=54705Cau<_|h-BwPBNy}V zqyV1~m%^~Tz(A8oGiQ_1imCv&3{Ni8Fy}}kOYMR{x3J2>Y>%LDi^2?pbf1V+?*QZS z496gIS8p@l@&X@Y??80hO#M z5|gzHgCpIee6k$P4PCh+tGoj}L(N0;U9v1H!~OG0&GPaJElmR~(~(dE3`=UN>5iX^+J{_b&=fEJ`EFr)yNawwzSMd!_+_p zcPB4nUqkm~7Z0yW{fta+?eNk-i;yy>L=O}9R8trCG?Vml7w3q)uuw;?tQ@y|lgiM< zTt_dr+z9_%kG#m-bZ5sR^T>iUvnc(fsC@0HK&SHJ;0OzJ+q`ql4Wk?tA}jpLjhy`r zi@f!n^-~HA%hJsZN|TGL+;Z}bea(%GEVH5tD@@JvOtbU30zAw7TrKiLt5Thc^uvve zvoaFR@=HoR%`=lSyqrw4E4=&SUu2i>otxm^=|8vy-NHKHAJtF*x}QEh}HM^RtcA? zd+S&>P5k`#gOfm;K<{Rwg39oK_1s^~*Et*)%aMG%dfi%%u*1)eRVXFczp_r)QDVz@ zf7ThtW1)|D`=way69n%*TpDN@*UI+&vB9hg|1!yaEs8M`wYNM^dK)Qjk6)};_Nwlr aU+bEe-17IBA4o99d|>^z@6P4R=NSQ(fU?~H delta 1069 zcmey!*~~dXr@q9rI5*F|!rRSJzudyLGBBw)xzNqX!_%aqAk8Q-(K0Q}zr?*X)U2{9 zkjp5k+|SR^yTr{jz}ZdTDLJsnJSwO#tu)-gu);Mtpd{PPB|XG1HLS|Km`m4Ap}06h zH#Nn`)YQ;Y!6cw6DnDHzDAh98Jv-Udq{=U~)Uwd9*e$9u)uh-hO+PEqFweQt*&;o) zASA;y$0MYi%f!Vg%b+;GJTJQ})HTXEHQ3!Zur$yjB27CtF+A7Qq{7GCJlN6QAh0lS z;z#lD^eorHyriHkUr$fZ#0odd;*dncV8cqof^4tc?6jc7z?`)3EY}=MOZP}F_k8D& zuz&(j%L45T6N|_kBk#O$zkqbl@@y|(^P==B*R0~qs5H+|KhONh@r>f(k%@^GS&^QZ zCh2LxLE4pt#YIl0+L_75MU{aCZYh3|=@G6`CD~cU{vr8XuE~Yv9;K!QQQ_u^x%zp9 zK^b|W1&&3Yk-3J+8GeZc{)r(~e)`(^KADk|&oYYFr}-r1yOdUDRh9>a`MY_W88}yj zmPZ7Ih9wpi`e+yWyBS1!ng^5yM|e1LSwv=pm4_8pWv2yM24NAQAzHp z^^T7D$$mK%nUP$krIx8qp83TtY5M5}r7nTN-e!>|21O(ej#3I##!M$ z*`Dauc~&|47CI`JcvYC0Bv<-n7JFoR`A3Erh9-x2dKurrB$YL>FVk# z7zT!vT3Ccs207(h7->7@C58AE7h9xry^hvx*m5G~ zbI-J*qUuf=R}-JRzvdRDa!<{jZEZ7ugWT2SPbXB=O#gCYTK)9gMwhvM(=27oXJ0uh zGRZ;nDi`a2_W0}5*YjSt|7P&;aJq-ad$l5_#+-9q&w@>_7rLxmzwhJK`~2%GFLK^1 z`5g1>(NsfUg?5);rvf+g3%WaN&fQpd;hpcIydPq#nR#!xJ&3q@!Txo7dGw9id2>&k z)rj@>N#r@bypJjPf$rAFDjE8-q-O~xJm$&TZ2B+9Xz>q&x7 diff --git a/secrets/bitwarden/id.age b/secrets/bitwarden/id.age index 4ea38d7..a2c3bc7 100644 --- a/secrets/bitwarden/id.age +++ b/secrets/bitwarden/id.age @@ -1,19 +1,21 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA H7YH2bTxZIlSQR6h9LTj/rdgIH1FzrT3zGujEGWa/T0 -EB/hy708s62jz9yhqVMp/iouRC3Hf/GahvtZzgTK6Uk --> ssh-ed25519 4PzZog 0UlgzFAlGE4dOOHlGaI9DNBu2UaNTGOzjICpA218m1E -guZIR8Czh3zt4W4mKkHzp0VzhdK2nzM1hDB94t4AyFY --> ssh-ed25519 dA0vRg 7J2jo8Y7mlp91/N41e+cuv4Y46Ui+DKnNhfeXd2dsj8 -HqAFiScEAKMK4z4bfx+7PQQJQwm80GxjzjBghplVQtg --> ssh-ed25519 5Nd93w VIsfbZTy3Ima3RoXrVDmzm/bBlPRT7vgzwKLkQ+7WCE -ZTX0Gryg/XoQ7Pu0jmBb0MBKv0ee6GUFuOj27SThHIo --> ssh-ed25519 q8eJgg FOcmChMzV93MYDuFEraXcksxUi2YSxM0t1VXXmZOVXk -vBdFZBUquAmb1GQV+Gs8wLzzK0IS2yV/o9cnYiMGBPs --> ssh-ed25519 KVr8rw qC6uMcLvYz4gIK4Ajrfqzr1PBC4Iqgw6elBPRztTUzM -ww7UnTYn+ZwUwTg2xpNIp9cmPCxRztn+NWGzVfSgCMs --> ssh-ed25519 fia1eQ o3z/yAM9iwIYMJnmp/uJ/ul7nNp447VgumnKzSQyvig -dUXr5Za7VZzHJSmMwUw76TptIRHdtBRdHv4IRKfzZog --> ssh-ed25519 IzAMqA otPdEEaDoxx4CiZkn+Ho+Vp+l+BPC2a5vkSv1DCg4Bw -FCFjzX4tueayqW2vhzowZfntufX8uR5ViGFH78r82J4 ---- Tnv8fDlZG/DndtKdjbuxPnw6d36W0lZ0uetXa1VcaOs -5m P_\@%ǖ2ƺMCyz*=QM>X3/1 4A5(c4gf,k \ No newline at end of file +-> ssh-ed25519 V1pwNA 79HhvqifubFk4bhlUPgKbgSplC41o8/uZV27eaeM0SA +mSJ2rkmOlgXyQAXj6pbFoajxCwPzKDBUWRPXqvHrW+8 +-> ssh-ed25519 4PzZog w+6c3JxUfEkgvDz7pq+451XSGC64TCNWau9zOGajpjQ +mEdXqG+GpaYVj6ICYPkCyA9ZRNmMtNsxWNeOpYOhkF0 +-> ssh-ed25519 dA0vRg Iy3bkGWSkMvk3wH05ETCFqZzUIc835XyJGHXlfmG2VI +ShexjmkSwsEgHR3uj+sftcB49zbp2z40Mi7NN7VYcII +-> ssh-ed25519 5Nd93w TM6CtcmxkTqQTP5UVD/1HPijQhMQsYdPrknDREwxtFw ++ld4GvbKQSKAUwMYzDSxtZqiN3OdnWlszYVzOrMbU0Q +-> ssh-ed25519 q8eJgg UgE7W6Lf/jdlSs2TpZNX2wRTY3iwQ1MzZE7zAN5Abz0 +oYf9iiAeoVg4RLYWEvw5xyGevxYQiiqELw/NLiBCZWI +-> ssh-ed25519 KVr8rw ZtAdKYXNsNCo7MzfBlQrax/sWItsFQtEo/tESJaviXs +Njql6s/+QtIbBmsbMYllDxodpIaBnRaMoojap4jUVwQ +-> ssh-ed25519 fia1eQ nIgFm64i5MPK/GvKl35nnXOO4hoD6+mFzJsFeB/6ICw +bJoDOMX3ek/5lVLeI1v99C24l4EwFcXIFAAlTMJb+Co +-> ssh-ed25519 Km71ZA sTHVMQlRs5/xewuUa6yFjuqCEqmWlekSwab0z4OWJRc +ExJw8np5XfBSSLo4cwwYoDoi/GxSGKkTn5rcKdMmI34 +-> ssh-ed25519 IzAMqA N6d6EYxr2LUzuHrH83h06JE5MGPcqdAMixJH3GZed0Q ++dE0EBX7jPvMv2qMI3mIuiM9TrhFYQwwC/+Ta+DiCNY +--- g8A4+bzRE56xnD8tVagvXopX6VlcS5iJcOcKTxC0ZGk +K!'_*VEJɇ?{&\AurAXwgzƠXÚzؤeN0&ɵ$$&Ɉ: \ No newline at end of file diff --git a/secrets/bitwarden/secret.age b/secrets/bitwarden/secret.age index f48af48ef1bda0cb2d10b69f4678b2d88de6df4c..2b24b470bd8a077ef66bfa24c92871f9628777ea 100644 GIT binary patch literal 1122 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5sZoch1cy zGW5+daSHR$Ht_W_s&aA;3iJ(&bo16ubuBP*%t(n02@ej+Ea!6dF?Y!cj;Kt{O^qt? zD%Um)_SY^8PBZdzPuDLFaIG>e(k?Le&nqc%%SX4(B%mrPKV8AYv#_c%C_AIrGu=PE z!pSen+t9-)#3|IXz$3sV$~D6?E#I;#H^Q~BDwNA8*V4n%IIGymti;R9qukddIaS-j z#lt+`C(XFZ)hRX5xH!bP%A>$PzyRI06i0)ypmYVpa6{uj)7%I%Lst)DLnmK-H`i?Q z97`jge0|gK(tKZ^d}GV<-14xja1*YgM8A}f;&iWM@0{|&TqjrUsxa5AG#|6DfXXV5 zjAY*ezoO(Evq&?S+(>lWO#M15njVd<}%t_IX z@C!CFjN~#iE%(X{&M8dEipn((C^m9QH*s+?@Tm&$NiR>13@r0X4=M}FPEE>jDo6L5 zcUX}{QMp2zk#ClxV_|M-xk+epdRbO>P8SW4Xbc0 zE-7>hF)u81%g_T3QWd#YeM)}fd%Y8>y7ynHe!MC#Z)&e`s-}Uh gPwqkKnc}~@tna<)(b7M?@?`m@3yTey!V0DV0A$H=;Q#;t delta 925 zcmaFF@r8YYPJOCVs9|PFrb%W+azMD5Yo%XhK}uk5d9F!LPPkz}xPfDEdPZKkzQ0>| zI#)@gS$0vOaZzDTazLeLPH>8aesE#2pP#3Xv$kd{;7#><<7oboiS%JcLnh)VM>4KyyX z^!N8kGY{8KN-FmD_AIGPwM;Y!cXQ0QUiT`Pj3T%Z6nuEeed+LD8Hn@iWD;w z$569^N`tBbPju_jG7}9`0~NB2Q?&hx(@KrPd?LL-|Hb{7lQj0`s|i{0;Se1AV=cGXjgXBeT52+`_!P%_?(zt4a-v${ZalLaItFN{b@0 zBGS>V^Q?08Ep${UaCddpx5x|2$xQPJatSjJ^NTEWbTe?t%{DYDk8%z(bf zFv(5#anJRN@C)$>EYx<(GY&O(it_SEGA?pAaEVMd@ee36$}lX+3XSyS%G`K&%f_>6 z{(k~iEstCHH_a@dD5SK|$1)-*E3@1z zE7?EL&(koJOS`hlB{4@o#h@&wDl@4fu-q)lB0It`(jv>G(y}T!J2Nn%tgyn!&$A+X z;z#jtFE5w$N{fn+f-J)*r();QLa$2a3VrRcfTBWu&+Pn^%7Cy$)2c9I!|Xt=KvRE1 zpWJNAlHdr#(CkQy>@;6*gMjq#tfc%5?Fz@L?7}jq(4s2e^emIf@r>f(mXS%BzKLG? z-Uc2?#V!&4B__dP1!iteMWN|MX@Le=VZp^lI(ZZt znkHuDd6*@a7rU7kX5}~s zri2@YIeTTKx_FqTC#E{0$AEWOkwsCtLa>{DQb?w+nUi^XWp+wfU`f48Sb0QlUT(RQ ziKkDVXR=#aW~f_uK#-@CCs%e#vVUGsv9^Dqr=?R;L~5v!ajPUnTdv}fePks{uNarkxph+*%3v)7N&tlX+@DM4@<_5<36-kz<&iVQg zWs&ICdFPrNMmZ`tnR#SnglAWjrF%O1n-)c-1vuq}W@NiNrWO`Eg}YRw;Q`S=Bem>7jd=DC#=IO`Xe2ZU6)I_oEU_5#VnUWtf#@kXB$BnHOPLkmeN@=oaSdKf^n?_6A3y ziyK~he&x<=npAS>+wRisqB=jO%0Ew1w^;ruabf4{7|#yjYfHW!@_rW0`dMGOetpGv zVaEO`^(#8O_>F9qt#aggZus9`#q+zueXZ?T2e+Afx_&C$(3kW?q2S~Kw%ZdEfA~JU zcx3;ot#_{&GBqkbuYB8g;_tR)C;2)yE8qXySg`zjUSH7H`x~RLFV89F6K_`YX$Yt; znDhKcZj9Tb&$*K9lO>8=lL9z(Jx(62Wo@o+`&88K{Po<&mt41g`{SOsNC=`NWUkcy#`s-;?)Mna*dJ zSZXioToH-6@OOPf?~S*)+jG6H2FZD|8jE&aF8H=sfg*!Mn1x;L}$ zdC3lsJ9hQD3#I#B#}`NZ(6Wf>30W?G#wcW+-|Z{RPo-_x7nR&)3wnF*@J rDe&~+X)mL{e9I9ipP=X<>i6O01&QR%(YI9?g|0j8DBK($ubKk@cY0-{ delta 1455 zcmeys)5J4Dr#>pJL_adkBET!%)HpINJI6H3&%-au+&DeW&m-M9s5H>a%sjx?Akx__ zk}JbA!pX-gG1I8DJkg~%qN*}H)yXI$)Y3RJv82$+z%o3;JD?)H(4)8@n@iVDp}06h zH#Nn`)YQ;Y!6cw6DnDJpOW#Sm(%8b%FDES0AT-<8*R3MgGC9ROH_|dNGEBcvzof9- z)F;5%J1%g{G4($vCP-z&`0E27XX)40UQG{7h_$0^j=!aOz6EGnqDD9zh- z;z#lD0+$SbXUpIaj}*&*B169*H#he@FV|e}!X!uc@-mNNW1|4~aG%`Lph{ORi;BRC zz~pqJsI;sKFVpN&&qBvgC!b8uL=%q`pR&>@x5`Shl1NKqH-o^*@r>f(nIVa;nP~-i zSx$x?23cXwDH+K**=9M3q1stR+M&J`<<906B|fJ4*+$7+VU>Aa*%nT&e)$pR=B|mQ z#^vt*`hk9)-Y(`Po~|wiqF1qJz&&oYYF8wEHARRm^v2fF2C8v7ZAWac{+ zR66EHc}KY?`Itlm8oGv<`6T%nCmUFBRTUYhdgTRq8b|n-21XfLMwu7{=BAZ|nmCn5 z6()OWTNZh`C7Fel=oc8E$AEWOkwsCtf@y?%alS>Ox23c2sewSBSHJQoco` zbFhVDW}c&2KDu>jnTdv}feL=%5iTZ97D;*DuCD1u=9TW=;n^n1{uY*I?nORE#jYiu z^`*(K!IqZ#t|nZ?=2-zAK7LLvX8x|(zD8B1iB5*85vGNyxj7-l9wDw(VNT^GKDo{X z`H|?>c~&|47CI_KdAXUDmw9?tdZ!yY1v?icmgo8hdYcv$rBp=}dxTe+dV0B7nkEIh zIE8W*8CL~F2D#L0=bD99gqG%(q?HC)W*eoYWttl~8TuurWa}s8mb!#`=js=8>FVk# zWO@YZr{v|hC3%|qn3reyWk!W18C01X1%(;wSL9Vy1{qm;mHYUYnHGj}^+;5DMsID3 z3}|Sv`09DyZ9St&=swn+IaBL@d-q$g>r7Z-TnK9@h>~#)to+`>X-02y!cY$ zTPr{R^Z83yQ+dx_G0$SV)A_9H-fPjIs*~HNgz4^;FnlT&`eoaz4BZWCo)g}cb*_z` zb$!2z7|%T6ch~=I+g2G{-=J}FzVV*Q)GgmSo>or$7IXRcEAHc`)P6^CPO;@)^u%6f z`L6e++z0B6Kh3P|B>m_LozeR)^w+AgOzCzZN|84nr;RUc>; zZ*w%~{(EOH|0S*)^;X`K`ad?DF7dv#N9v!(&gxw%uhVl}`0rj~>yh%6F`T=u=-uvvLeq4=8;KP1lKt%w!W<1~k diff --git a/secrets/discord/token.age b/secrets/discord/token.age index c6c06dd99891421e48fcc8dedfb1d6f069342086..71485f4f55b267a675f2b560b5502afdf12b55b2 100644 GIT binary patch literal 1314 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5w}R4fM(g zE_TYy$_uEhv`n`sPA$ui^fa_6ODu2?PBAa@a?Li)G|LZkOXo5U$P6+!D9gyPO!9M0 zEKc$cwlqz3EY5K^bBhS6N;9o0GfpZiEilh<&qlY+B%mrPKV2ceJjcV|qf9%y+^yU+ z#n`gSso1pGGc?`LxwNb*%_qeqB_}vC*EOla!-UH*Jt)b)vLY)g(5ukj&BP+9G}6?= z-6zMyz&}ObH96lWJt(}=pgcS@7sIv`M}xAUbOk53L?Z*Qh~i2MN7MY^0+Z6PfC>{w z!_*S(AVaf2*U&J3qk>Xx3k#g}KBV`dtb8&>XNY+;a}m+O)19ua7sZV~3^=j7xTS!fz%;E8UV zcUX}{QMrOys$qqBiEpM$aA0tzhp&HOa;jNGNn(*_XoZu7re`v8^MzUFXT8Mi=N@S3)QL1B#S-EpYx+}VEX_<+Jseuaq zNyQl{P9C9^6{SXb{-If!&gD^6DIV#8+ED?a6@dkLC3%)*AucW@M)_Pp`Dp=ZIVIjv zN#!{v=9zwpRjFAfrjce&DZZ6P{>dH{zUdYE!QtkXRq5!qdFPrNMmZ{Ex`!s0dIcL5 zn1!2pxH_izR+LnRBs*1Qc^f(B8Jl^AnOTNaW>y#`hBU$^WT1!BaTXO*LGp`${Hk9mcWV^LLscVL=VXkwK| ziMf7CWkkMlu6d@uL6&K9W>L9ely{n6NFbMIKzLzpL{yn;pi_o{Yg%ZOdzzzBfp?;F zR#B9PVN{TNT12>IX^N{?sR5U+uC79`QL1NHctMJfw!4vIRbW!7g^{0;u}grZZ)&B9 zOPEtPd-kW-G9Tb z)Oh9wq0==78=wC1x|{OnO6|rz!mFIUV^q5O-n8e;#zvx5A zr**nX}OO$5 zM3}R)TYzIZS8z#sR%p6Wuu*PyM3_f$fLpO&dP$LwpL3>hjzMarUrAz0PFiGfPD!ET z#E;_P$wuy_Ro(%m;RPZ7mBxX7DPDnQc@{}NC1$Q!ZoXB%Ar*lJg&8G&X6gA{hK7d8 z631FEvQoIK1bB2BzY-P}#hld@CO zjIx6reO#RajmwivolU$ljLp5vEt2%zBk~+4pJf!UPc-%RGssDHEDm;cN((5>&~`U= zOZN)RNKDNzkM#6%iYhYpGs};1sme~~DhkOAF9`}Lh%8P{403l*%F;JVDh|kWO||s$ z_i&Byj7%y_jwrM&C`z$Fj{)znB8#GO1=A=G@1$Z=bC1G;DE|VFVxxMm+|;O${J<>t zh{BAVD(_H_91m}=%F-04Y%T-y46l%?jH)c}GGmvFkkV8qqu`RXs@!5{SHDs-7hk`M z@@yXum#V_Fbad;|G7}9`0~Lz$lJbfQd^`*E1Dq?$B7=)vEAm_uoh@7w3rjKr)6&c; z>+}5c{HomiB0{-}s*23Rf|JWriz8i%%Y1#awJklo14F|7qWpr20|L!UO@lox%rc!y za+1-l^Q?08Ep$|HamgDh_qZt_sz64K*t-b5HW9@QcXJs?c`N zaw+C=^!6|hP06cIs`9fe4)gR(F)+0V4KOaLsB{j?PxLo%^6*b`jY=tZHw-u6($&>f zNJ>of%!@E`bIdo*@hwd%4u~+!%Pa|SwlFm}$~E>%$uSH`_DqflC{AcK$_g~qyPX%X72Op1n z%(L-l(ydfJ%bf-J)l$c`Yj5Z43n=-xc$BUB#}W7_&%XTHohse1s^5L#M>1^MW>)FR z-JPU*@Z$-u#GpM6!rG3ZzxZ$HOkQKDcKb+Baii$;)z5D%%+}t{vU$rI+hkw6&nAn+`0%89)gmLW*@;t2w^**IQFG}C%Ve+Q(p(wddi#kYL-N-TU*+82uy0?Rd9{1i GuG0XjT$ir^ diff --git a/secrets/dns_certs.secret.age b/secrets/dns_certs.secret.age index 2f4966b5c71bb8a5e9d37cb94e88694436c538c5..507273eaa1055c019a0b63e7871a9455ba2ba794 100644 GIT binary patch literal 3034 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 Kpr5Or_X7X|eeA>l literal 2924 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 U3+6q#)VeW5NbCOOH48og0JYP|rT_o{ diff --git a/secrets/dns_dnskeys.conf.age b/secrets/dns_dnskeys.conf.age index 16c3f341e0a66d3669b3c0c23e3d0936125f2e6b..dc88913a3d85c524c2a2c9257f8e0fd6914a9b52 100644 GIT binary patch literal 1314 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5w{-40p3M zGW1CGHgw4eFY^p?bWIE~_o}MMGs^X|FmN}^j_@n<_Vi2-E9bH_@~Fzra?}p7Nb=J+ z2o5!KPt5TTH3|zbHt-47Pd0OOiP8^uHOwik@HU{-BLf$%OcM)rP9~jC#~F6yTHTO*^w)|u&5xtG~Y5MDI-1CGRG)A*)cUF zJUH3HB0}5Dvdl6+z|Ykpr_d$YDIeXo6i0)ypmYVt60@lC@~{*$qsnrF0+-SVgP>%u zfM6$=Fwe4#0DW!qbQ5RK(h%q5oKP-PqX@&Qi2Q7A|Ln-1Tvtb9qYS?^{Ya0>NaL)^ zqHwRkveI;8$Iwds2n@fO`lVPJmn(!CWCa`eBsp976a*G}ho)JEhMPMYmlX$>8-|yZ zm>K7qWLvnU2YIB0I&xV$I~95d7Md7&Ia#$j%7V*FJ2|7m-6$Ed4BOH&6Ae=X6-v_5 z@(N0WEd#>}l2VM!J*qMaJOj&&3Nn2y{Y(-Q3*0=y+}#7s+$@89xw1U+a*Fefozp`L z12Zcg=*S%!Xcp`~*qSA>yvxksp%Nkm9yaB{Fql)rw6 zV^M*2l9_(6S%!I$S-P2NW{#g_PFeYvdk#bz|v76w6sJ!FTBJp(kL?}+$lXj*C*TDH7vxlEXv>2 z#68I0JIu$z)ziy6#4VjGATlYSDxlaqCm_SeC_6OSH@G6oAi~%(w=y`hEZN81FTKn% z%+lM#EysjQS65fT*w@d(I4~;DB*HAy+{@WD!@|6<($}>tv>@HNG9%5PBsVR{IWN21 zpwgGC;!dZ#yT$vs36ofT5~lr DcZ{=R literal 1204 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5ux5b8#y1 zNi_Ej4t7nCDl{uJGs(^NEq6~YN;In|$#Dz`(hs&war4v9@#Hco&C~Zvbjm9+@iWd# zFRI84De%rQF)%E43kvbF@UN%}4oEc23@&%BbVRq!B%mrPKV6|Xydu@zD>GT!Fgv@* zH_g(;&(ASX-?g$LA|s;GI55PZ#5_McFxV?Iu$-&J-_@xqKc!gT+{nZ$#5KgfvMM*y z#Kj}Yx41YlFw4ofDBH(7$KAryG9BHv6i0)ypmYTb^YR?aqQFX*P~R%!;Kan_WQ)iY zm(W6|VBhpWSNCF`*RupMdQ0h{Rw+U&l;iAIlI+zo6ov#H2uDKW&pF zgAk)aBX9H6D)+!NcN28mO#M5j)%uUKqFEb2@^6}NL45_RPt1$C)Gjq)kceYFo4T#JxPYW=} z&C1Pnc2DPWGtEf!3@XeF&rkKTjPlDiiYUsA^zaJF3@z~~G%zW$%r{6jEe$rx3ol2v z%{#2fqNrRUBH6>k!zirWJD@1ZJR;lJ-6XHVDJ`t3Fsd-nvm_)aA}7~4%h1%{uqu+v zzse-Y$h^?pH8spT-?`A#*|9X!vMR75r^wPZIMLDBG$Px(G|wnI*E<{CwzSMd!_+{9 z3TI27iV$}{lSH2^r}ET9!<-U*FT-5J)L<{SF#TY!62Bau+$A{YH6^GaWI+x$v${PZ0a60_Z0b3)CF zQ-UMILUR3zvNBC`9Q{kolEbP(JPL|Jq7uDAw9Ac*Jkle%3?ov_wVf@3Df@JS2Kk2LX24zLW5Fb(sFFmZLRuy8f9boBKO ztn%?R&B<`~HV90w)Xom&+WX76!jffy<&q{QAGa;)t|pV2cLd$uW)UUcGHv7XAk}Lj zlcu&Ny__9!=(g~ltELZo78%-pTxk1$jqt;E$=aO%Q=2S&n!Duo2wZ>tYZXUMQ{*n6 z31`EPoRmJAw##_QFYCL?`X)@zlcOHwZ(I<(?27c-hWfg7(b{2FMzQ?4Cwq5)Ja517 R$)T-&F46h3FV2Zw2>|)Wm^J_a diff --git a/secrets/email/details.age b/secrets/email/details.age index aee60aa..e38bd00 100644 --- a/secrets/email/details.age +++ b/secrets/email/details.age @@ -1,26 +1,29 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA P8uCL9OgS5BrRWrGEFOSqvO4KsGc3Y3q02OL4sFBQCg -XuuBTNDWEkcDzcO/aFgh7d3XhRmj/8maHx2U6l4KOgc --> ssh-ed25519 4PzZog 20A9EEcTrw/ZJjkvawiiUqHmMaNmwuP72VErLL8Z3B8 -w2Pl4/J0+MI07Blk3rRLAULbxMbFNLQpZkdJPhnoTK8 --> ssh-ed25519 dA0vRg jn2VA10+qrRAktjhSARaE+MAS5HsHsoIZfc1/ao/mV8 -3ahsWtZ8/Bb3tpQnLSyEPFHeW7dsX9uEaLZbJ200u7E --> ssh-ed25519 5Nd93w WKXWwcQBExcz6niKqBYT3JcL8EHfY2VeYfnTIEtEfGs -gzJOdp1j4QX3bWDzJgBig4/vDxlRRQl+jsGmcp95drE --> ssh-ed25519 q8eJgg I1J3jOc15TsBijQW8/DZbRETY+233V81vPLKfGI0ji0 -SLtoYZ+8T72c+FWAi8dz57VJ8wweJY737AKPF0PQEtE --> ssh-ed25519 KVr8rw CQZs4smVwaFAaFbLeyTFi/IaJyle199te4X8Zq0AfjA -/74zAyuwEmB1KcGBZK4QGgwShhqxOcEQ5wlpmtAT7Xw --> ssh-ed25519 fia1eQ CkkfDdt9iAaUxUZt+aD+VDMPUcMegomtFiR6CCux/UY -WQcE9ck0HuSXYCWqsy6NOXAHOlE4VIRUkgz/i+7AVQE --> ssh-ed25519 IzAMqA 2pbs+DJzOw4rgM80o0lUFzIgdMN/X0/7wrUh/OAxykA -291gUsUfOEEsf9o/qVoVI3s3gHmPK400NCEmpxNsefw --> ssh-ed25519 uZzB3g YP3htz8c1QJzFyAyGopjelQCKPyTx0SOOTVEL/uTK1I -iupAfrSbl5ybwi9Le655pU3Kw+KKndFZI9M+AlSrBWk --> ssh-ed25519 Hb0ipQ odISOFTymnTj8TnenWHMHeU0Qh4OSGYFy6vJUieehhE -G+Jje+2S+l9bSnKKrwGV5V2xLczDDPFXlZ8MsrL6jHs --> ssh-ed25519 IzAMqA HIG1qsEisRUws33TxC8yGSrITlwDxuL/RIL6lkdjwUk -IWMnSXxQzv8cAQKNmiY/+hRb86aAuFloQk9WFFcCSWY ---- UK7VzqqXFlN+IVB2hl81+7o1d1NjbFNY7tYRbTvnKmo -(myHC|B,ì# kWsI{KHf⡒4F,zXv -W1!*{B)ReGK=@Q>BǜeL6D( GN $=A_Y!0tGq ssh-ed25519 V1pwNA sW9NG3ZnVZ7XN4iMceA+WNwEmGp5mB8fYRML4JMxTx4 +Ugwsmg4yXfq9YH99RoV2MymOyhHn+WEFbhSq3jOS+Jk +-> ssh-ed25519 4PzZog ncbPVDYkLeBV89U+YKVSGRyNDIdLDuN/YV9AiGcYfkY +rifseFii9IZI6t2cDfhi1GXQQRngI8IM+3H8znbMA/0 +-> ssh-ed25519 dA0vRg ZU44BDl8VU2ri+qNYEEj8GF4x4gGUQPnr6YlFA5itGk +zV29wfmrtyxEU1JFEm5P7pfkWwzmNpXflfLRsyZ3vCA +-> ssh-ed25519 5Nd93w BCqKxqNscTU2iEm4h/78KCzMjRWtHlO3rwZZjq2lJFQ +Y9yLQ33RvcO1g3a1q3w47Y0kgg1NZpdlYk34LrZ69mw +-> ssh-ed25519 q8eJgg lWbDTedbgvxvGpMPDWdrghAKO3duh85kaOR+7xsPd3E +MzwcVM+gzJ/IApGVZNNM+RuYp7EKZyxCDjRkipL3aYU +-> ssh-ed25519 KVr8rw 8vJTA9ABfwuZyFwhFZD4n187b6gmq7zCLALqp56mFyw +iQ4MtJ1YtYycFi8qCs4N0/nIXccaw2swi9yIvOLmVmA +-> ssh-ed25519 fia1eQ hZzB90WDGom3oaOlWlcBg8iAMAfbZGyosgFIa8AiTWI +HekDEc26Y121KRtKLavDD1xKcaClVgn2tGPrgQYWQBo +-> ssh-ed25519 Km71ZA uunwnxdg7A6ZGTbV51r5XL/2hJN/VFIUas0TVxid0Xc +zGx6iHfu+rZ9WbtIITtzDk0nzkFCeIRQpdRVoj7dj0E +-> ssh-ed25519 IzAMqA 17lTeNgkOhX6iOPix/YeKZyztDHYLu6OIjZOctANpmQ +fu8VIba1ZNy3QvnVk3bPmCA1n6/dcB02epAs0GLb6zE +-> ssh-ed25519 uZzB3g I0QOJAnUor5hnoKDlFeSuW82o94zcWcs6VvKTq37lVo +S6o+cem4L12E8V/DzbvL75azwrhLgZJXkxWXuCd4+Z4 +-> ssh-ed25519 Hb0ipQ cEsppH2jMi71R0513L/vq7MaFYYWiRrWZKricdhW/H8 +IvRQejJ2AOQAeWUumh4an0LUSBJYMMnOIr9PU8FjYiA +-> ssh-ed25519 IzAMqA cL7V3gfdSkpHtkcDhaH0ATTWUzBir09Xhe91wlaGJ14 +GU8IQvHlwyBBONJKufQRwEr7nZy6y36XszV+E97VA94 +--- Nq7IuDZY4GM8UBq0wdEnn/kZEJRdUlmqR75SlX75Q7w +oTjo(RZlmђ&f7;a8B|ӔB/l +g#L"/* ,a.f.Q +ՓoEMV=2q;IawkF\" Q7$.`MRX۰ \ No newline at end of file diff --git a/secrets/forgejo/runners/ssh.age b/secrets/forgejo/runners/ssh.age index 9a87cf315aad1c018c71b9e1f52cd48bb8a2be84..ec1e6ffb8c8855ba70c679581ec3f49cc0d3bbfc 100644 GIT binary patch literal 1601 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5wB8@-M9N za`P&6G`2_!3D1tq4ff2<%`r~$a52&^DoSw-^9}I|a5nYK@Z?H1_VJCVvhWQL*3ULf z&MXMY)ptqCP75k5%dkifbS%s<2`(!MHY;&4w?MbeB%mrPKV6~R%hWw2E7{j2$|u<} zq9Qdg$ke>lwYVfF-`U*KvAonWKRC>|(9$u{$(1Y0K;PTYBsnwG*I7Hv(mXFDxWLoG zIM>O?D<{g=-6K;!q$JNcG~6$!EF0an6i0)ypmYV_5RW|LFxT=lZ6~*4i=xP+sH6x( z!|?PZvxvgvJWuVUVh_heCrhu~P*<+1qO7P&%c`P`h!ivZ%A{hK;IeSv+|Zohz~m4! zv%s<-?FbXoi2Q=QEE9CwO#M@^ZDD5IrQ*G7}9`0~MSy z{Qb1kgTmd)jkC)$Tr)C4qY4aj@(Qveaw`n{sx0%|Od={u3JRUw0=bfkN=?$zJhM^? zOcFD+L(U|?jVN4l$iD7xRA3;jdf0~M-5iVV!MjI+uzje~;Aw9Qj3 z!%cnMeZ7JV5|fQ8A`%meBYX>jON=rDEx6oWibF~bvx3Zg0&@fP-7}1;jLHl01AMcq zLh=)%!U77TER0I3Dzd`MJ<)9|jjD1oPFKi}2=j?daV|+R40WqaHpnh95ArR_OfN`I zGs+7$OpeUYFAvK1tSYf|&*w79@GnU6^Yiu$Gxf;MGj%D?&CU++^ENjw@(XfI%d?Cq z3y(4g3vlww59HF-)l~@5_Hi=F53F*v@UP1B$_})s45@NX&++ti(+>+a^DcL`bn=ME zudK)mOXiw<>RG#Zwu|GUT^W@`=z9K3q5JmlAwwsMW7JKsqh z@-c7dG&fkEC%+|h;@l(hm-PQTPTctIYs;+1&K#=o!OS_!wBOV(ZZ*h>oygQwFww-D zyL#Ss7ww&YJZp4k*?iTB%rMz$A1Jpp?ce!a>2>dBdd^VP&EvMyt-iE8;;P!B?j0L8 z&i%3U-5TKqyf!wuhFcEghsiZGTsUL9^ghGibpi7f&K~pq>vv&&ke%uJ4xOuRD^|tL z(F)_cG)=+EXX49Gzc~KAvwpq6CNJowOB?rEqt!JsNBqvaO?l*E(c5IQ#x$~P-Ad8N z2bS&roY(9h7dc09R!i(g&uw3#q9e96r5UTwXZkaVwKSuRZ+@EKoPAdh*}mt?D=+qI zxw0a9{pT%atCEygfBi0yl|4eJt;vaibTh~?Nnzvt@x y$dh|{QSYVwQL1tV2YhPw=bQXmr8W1^$wda-Ext-;s{cp#cg~yU8r@^1_W%IvM^6U; delta 1405 zcmX@ebD4XBPQ6!Ju)ddmhL?qwK1n0atmc%@53vU6ZbfLl>SxV}kofq#K(sIjkpZe)R* zhi_VVvQMxHm%Cd^hP%I+v9U=+Nq&^RSBPgwl|huROHf&`S&Bh;rmMF_WKuw3foDMZ z#E;@(PX1=@W>GoWu7S=z?%|dG;qEzJCQeDF&ORP)nZbS@q53IRWhRFCzIlOMB>`?u zMK0xrA#Tnl-sxFp9ucJ>-Y!*M>4~m}ei=df75c@=`H@x5>AsWW7$w4Ty{o(;gCk9H z%1tA@-P}V9++4yVB8*MS^gTTy-Exx6JWTv^O3KW_gUh)Reaiwfii)yJeSAFJ-9wFC zvVEO{a~;i1+$~*;jg5TDQc{eaEQ=kTj3%F9l&IHE_bp3uuL|-^&Wy4s*AGa^EGZ5M z%umU)G!973)6cOi@bvRGG|6;JFXpl+DGU$Sj_@~%3dk?=2+nZ|bv2IgaLY=`2(e6d zbj-6b(=N}oNQv}u%SR7?@310^qH+blFvC(0V@D&4j1rS1PXm+EdK0g7eP`pyOhdEe zoB*c`7Zc0Uob<%1Lbq(L6u*E96Zag;l<-RJ64MaFV55j+(Vk44O0UZypjvGivqMO{e4RHLyIhe%~PGd4YMkf+6gO)4@xxqMtoA}Yel^Zmk$GgEvb4b8j_^88E7oJ>%wa6%`YUf+_fOPEUc*BJS(Rlq%f(d#JS8R(K|S|*fo$#S65fTBh(^4F}Nt) z%|Ei-I5NyEC%iB`Ik3FMIXgl-+rvDgpg7+!$;8CaH`s*Bp3U-~{emw!PWQ~$a-Qz4 zJ6%`&ICP0-c|skpz?5`Z#bZZgM8#FpKD?~v`1|u_q+i~1ZablzC>Lg>gY`>-Cz!5! zIITv;W4BP?*3%R29bnX$ZP9*ciTDw|R*AbEJLEe1HZ3|Yu;y>=Otp#+D$ie4CQ9tt z|Mlw5?}t974g<1uEK0akK3H7fTUb=X%SfgEdSy|0vVXO)!_-XvbC+hsJ>Rr&eh zoDZKm%fxh+Oez1jE_z8>m&mNT%4wUY%drV+HD~@R_IvF8bzZDTTSM~3F8j{RMWhr}n2O%wkiU9<}nr!-ZZ}J4&a;%51Hyk;}Nb dJ7I#+`zk*5PB*QD*Ic<3LAI7h7Q{U|4gijd4l)1$ diff --git a/secrets/forgejo/runners/token1.age b/secrets/forgejo/runners/token1.age index bf7d1d5..723b2c9 100644 --- a/secrets/forgejo/runners/token1.age +++ b/secrets/forgejo/runners/token1.age @@ -1,22 +1,23 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA +pIQ+0uvquBBU5ZNQfiiUopQ/iodoDSPDsWNACANpkc -7ARm2csFT/lYYcck312gn+qFem6cSiHi1uzjd5uTSEM --> ssh-ed25519 4PzZog Ow4kjpBSlYqqOUnwyXfpuyVVG4V90AO+Ufg3urhbZTA -pqhJZHZjFCj9O2qKFJEesyw3QZ0KdtKM9aabt0qqyqY --> ssh-ed25519 dA0vRg LYcB23Z1a8veGkdyjVcrfLfpnRbeSYLLIwbqFkfkOwY -FgXSEffN3aa8p7mdbUg4ju05A6w7sgu9TEVZCuLg9H8 --> ssh-ed25519 5Nd93w +YYFQk5KWGpSB9Yd+RlfGBfuaJ4e4KoN+x6QOI8yLyU -4aDGQeg+qhWKbb8aIp/M931zbpFjvqUVDQr5luzKetI --> ssh-ed25519 q8eJgg OIX7xsmQUWnkTYeLMsLA041xszFNmSNu/dsdys5sLEg -kGh+aDF0EcCsrTd3eHIvHcp6Zz+n114Nve+iA9dJNFw --> ssh-ed25519 KVr8rw XlcnAJI30iJMH1Xi2DEMNUJWBaqaunFQUUqjKU8Goms -/zFGkNR5S+8cBcmnjlSVOP3sih4Xm4E5GtRpkG3fbWw --> ssh-ed25519 fia1eQ 1vb0ZzbLFiCWD/bEEQ+7ZqLOJpcNZA1v6fmBNMml9UA -/XFV734jcIrJCtwY63MgRcN3pyhGRmdE5WAhzCTrZlo --> ssh-ed25519 CqOTGQ oQFa2N/oo1mnS0d2Hn7sTr4XiKMm+AAANvTB3q+Cn1M -bBBOtb6zNevJiBU/PB3dE5TjaBzs5y6SAl1MOADwFqE --> ssh-ed25519 uZzB3g EtRrpCF2zNXG+Ap6orXxKCpgdp6OGBA20zT7iZMjfG4 -ZsxKfYW/2q6lnm+IuSANPHOuor3GxJNGtzD9lBT2Dlc ---- b+97Pc+Bh2lwkQ2OhlfGtpT05lzwBbmNxYy7TxkQvaA -b0a{|-{L -3 ssh-ed25519 V1pwNA ZZzPHXiieqnKeatxqOpOyJJdPCSrpU151rNY3PgewCc +usq82uQE6qxnwb5EYHlfXSl1A+oqV/DZcKlHmheNrLs +-> ssh-ed25519 4PzZog GPaAefwdrHHdkDJT4OHYFdmjUbXEQz3lLkGfu2M/c30 +hoWO80LE9PEMkqlQLD4WXIDc9rgX0uMbNzHkiXcVWRM +-> ssh-ed25519 dA0vRg 1WCuZ91cuKBZi7gFFVArvvAvMh6aU0AufX2vDHiXvTI +yUUbM5kXyyiNlvV7UWXNNhBe3JZ+ZxdoXf1FRwQiHt4 +-> ssh-ed25519 5Nd93w 8HkcjdSrVbg3TQFn/ldlqYEU3aPHFBIcXnzovwMv2Vc ++2kX+X1uYoUnyUyLYLLWeRw99OC3St30ky6Xsf7ls+Y +-> ssh-ed25519 q8eJgg moUF6G0Qsz6+vJTMFoKIusiCfapHvaRBdOoB9r2uP00 +limKEFL+4G28+jc5pOiNt1OkpQRzSXKq+3If8/Dfe+E +-> ssh-ed25519 KVr8rw /G4TpEFysiCx/eF25IA9gjmX4w1yGM6m2Lx1mTmf0mU +nXIuYPbV3S+0+3Ce45iPeAzZlIr1i0RnGWSLg3KBH5I +-> ssh-ed25519 fia1eQ tXV4gH4gIjFYWNxLV0AQVOvahTtvFWK5W6tNZTjA9ig +pxpIIZ4+/ItpG6nolOS7lxGwSkhwq1XvdxePxWsJYCE +-> ssh-ed25519 Km71ZA QRM3tBeZJGVMwZ51ZBlxGIzwGOyMB9ppGNq4pUyRsHo ++0QO4JlKaOUH5MY+w02Rq0DDNk76eSD2EVIAvQeiZ9Y +-> ssh-ed25519 CqOTGQ Ystm+4YnAlTTYPiHBXVa8lM/MGEfZ3OcmxiT8QcdKSY +F2b5grk6m2sVnhhWF68WxUemgtZHYSIJZ9e7eBKtIjA +-> ssh-ed25519 uZzB3g PepFlWAg+221m5eOVoNl1TIRVrS6lpkrQ9Dgce+Grwc +6/8sTiO+P/HgNbB8YyRVylAPPp3lwF4D6FbWWaPSxtE +--- 0PQ3rJZdbEfye9mLMrQJ0jGvJSiZ+9dh9Bv6bpGEBNs +^;Yh=p3>F:2b6+CE63TE.[,['3P 6_| *AQ*jc \ No newline at end of file diff --git a/secrets/forgejo/runners/token2.age b/secrets/forgejo/runners/token2.age index aec16c6..5360a17 100644 --- a/secrets/forgejo/runners/token2.age +++ b/secrets/forgejo/runners/token2.age @@ -1,21 +1,23 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA ccCI3dQxsa2ZCh0ZvVuZyVlGhbmDGZhpP/1ZOo4h0n4 -sZVa+SmOKofbQqLoccCVCucubBDZ+M6JjP7mYD1sPdo --> ssh-ed25519 4PzZog vUYse3RgWUEHV5WpaTooXTGRlZrPN9Rv5kgpDQF5bzI -4CXVFUyCBNNfNFtpNX85QbvypvGhqmqv8cZFxse8qY8 --> ssh-ed25519 dA0vRg fjBLqSO3lOAkFjIUf3cw9KcS6GiI3XHygzLqHZ8HWCI -r51K0Qn5CQ6bWjPMsbbx7GcZBFkfznlwUeAT7k48bTY --> ssh-ed25519 5Nd93w lm/dILoCnula6pjMSU36exugjaDUQdMyXu9J8o9aAGU -XKNybvPiP8p8ekJOYoYyQe0weZNvCKxHyRierqtOA/0 --> ssh-ed25519 q8eJgg kzY4FBRimHWOxBC40TOLbAXHjgeXoRrJNaVHzCIihCs -hL2sddOfuVpW0aR0IXUwlBnhUixpwtm2nN8ZLFwnKxY --> ssh-ed25519 KVr8rw nvbIH2FLP+1apZMSQbUmGvG9A7+8eRgH8aILlWtePBg -SJY3KmiPUHLjiPB92jW20RxzlHgie0cNyAmWbxn86Ck --> ssh-ed25519 fia1eQ gSgrywCP2+DAokxgLSRjh7g8kxqYMLyxXCpO1JyNOyk -vDFj0SVUJZ2+aTWrinJQNq7VCmZME0fc9A7SgPgttjQ --> ssh-ed25519 CqOTGQ Vh2iFaSEnJMD1Lg4PpNCnU5zF26t2yq6CjM1Fw1Xej0 -qFA7MEM82zAdKcdVBxmixpWXqQRbYYtUgYgvv+5Qr64 --> ssh-ed25519 uZzB3g OHlq5XFNupblTEbMi3jaf/LqvFCkD8Ni0ya5j5b2m3I -wamah1nxgBUQUkIEFXHuG9O5DvB9HnyaFqxsREM+T4w ---- FPKedvAzPcmXhVexIy1UpwSfwKCsdyfTxcl/AFagFt8 -"[V!h|*aٮ{4tG|}=/ib>?L"Ljje-㒤:;  \ No newline at end of file +-> ssh-ed25519 V1pwNA Lw89KnIDDurZQ0UaqDS1utTrKCGXR+Uxs3od/5n09io +1JECYcXRBNWwzoagvEKeoWoW2d8da15eWPfTD8nKqX0 +-> ssh-ed25519 4PzZog LB5CnkEPX2RH8vWdD15KMs/qgNbw3e7G8qCV1CMf8kE +pO77W91WR/8MRPLIuJrLk5ib9CPp7xHuUmTS8fmQ3KM +-> ssh-ed25519 dA0vRg QhtuGTY1MEpEjRahnU3WtON6Xda7y3HvGXpB3HcDfBk +6sCAQhU4K2nQ5pMbGYY75TKUXxZ4BKHCb6sOHMAuNEA +-> ssh-ed25519 5Nd93w 2QcbhnmxOkTrRUMrHR4X3spMUnsLXN9DDnh49qFAYx0 +SD47vo7tOPWmvXR2wTj+BSsxJUqnlXOu8HlTEOExeC4 +-> ssh-ed25519 q8eJgg 9TqmbSDG4KOl14FNZmZKFZ5Q/60K657phquz+qpIgyU +odOvsccHqgXoC7WgKcFjJDm5it9ZGm5ifjU2pt5hQZ4 +-> ssh-ed25519 KVr8rw w0fZq3VUrN8wi4UrhMUfrviUiaWl4Ol+tbTXN/urISs +TY+dO2Z6TmN9DBPuo1vyxgeXbDcqZlRoP+Q1IN6O/ks +-> ssh-ed25519 fia1eQ 5Aqk1jkUQkomeBioV7LAPMzurJ1dHdYHbzLHXH7mrRQ +j+7aPUOeJAI10FL4DjXKlYEkC25gM7TNy/X5vFk68+8 +-> ssh-ed25519 Km71ZA S9le6/bZxnkPVuCLqiYc8VMk8LXlk0BVJUtJYc/CmB4 +DTjvS3wBo+RHy0klprrgKS1wYAMAkfzPkpw/ip7KwpE +-> ssh-ed25519 CqOTGQ xba3GuenbljaFEcgaX5UknPWjJSyQOMBaJSGk4VHZg4 +uzGnhgquJHT4+0zop9wNg6Fm8ka/9Ri1yPjw65VnGtA +-> ssh-ed25519 uZzB3g WaU+50ui82IQHobA1QB62WX7bnjgxSVy9LAGjYifuHI +H0O4GIRchLil79zqim5v46RT8Xbu5zi0dKSRPiT6kHc +--- vg0SOy4LbcYEcxJMe6lbREFPPcxrRI/dJM7Lx3VC1rQ +bxmV^h0l@^RyS\rյ;@t~UYM)A?ƲW˹m,1I \ No newline at end of file diff --git a/secrets/gitlab/db_pw.age b/secrets/gitlab/db_pw.age index 0e130b3d50070bb8b63b7e1376260407b999bdc7..2c4ae22a1ff1b0aab7b4f2e6f43c0aa3125842c3 100644 GIT binary patch literal 1221 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5uxm$_;Vx zwFq}h3HJ{RF!D(?j5N`9j`B|pPB%|AsYtGn+chFT&nrL3*eIpc*+0Um62rC>M}xAUbOlqV)X4Clq|#(3kMt0u%#^aMq_VWM zq~Z!~bCZgsu%K)M(=?;NbOYxc6E0J;Jg@X@=K>S6e1nK2C+G6yA~(~5N>`7(oTRcS zWAl=<$RzKutcno-Ky<&E`lVPJmn)?ESO(@-n49=pROb8YCmI?WI(rBDBu2SJWT%y9 z6lIlU7zR`&x)g5)h6;x*CZWdG)Q5fXo zl2YPP&Q+G{mE`PS7VhtBZ0Hu892l4$6%p*@=Ng$|?r&fbWitab> zup*11a)o?XlML;sL|1M7Fc%-k(lRHPV&B||U=J5x3(KOoP1qu*@P4&oHy%WOUooG7}9`0~OLs zJq(@P+&!~{D-*r50!#x#{Czwl(@Ro(Q;Ix7oHL?Q%8W`QT+9m7Be{Y-a>|0uB2ub~ zb5iv69sM$cT|AQ9eT$q5O!7mkN`eZ5yeh*IL(8@E^3iSc&NVlTa#W}YFmN;Ubqme* zk20+EOL0o_$THL}bkuh>tME08^vX(hN=^>T4l^#wN#}Aj@p3DS2s1LzGN{ZdHO(yY zO*77Matd@cPV>w%5BKo4OsXoYh|2J)zzE6Gs46GpbOp!E?2Ix~|C|)p3fB;~pn{70 z)Q}2OzkHA4C@;rcqY%fcyi`kXry`4TUoIo3U>E)GT-8|aF3wuY`1`-d@fyGU4`_>{1W%zoZu>xDE+9SDyQ%Qmz)68fHG~TB8zZu zzoMkfB$whc$85vWd@gII>+Ji!-tj(?uhikp^}46{xqtCoF>Y5iHLoM?r@C{M?1YZ~ zDQXbUyu8dWhcB>L=7Zjzq&Hdo+!o#}?@S!tWvr3<0iX5zGr*fjF1fL8RCD|Ro~gFXOlV+0Czl~4*&oF delta 1023 zcmX@gd7Wc|PQ7cntGQD}aD|DFPeiV7QF(ZBj<2D=M}=dKbCpR^g=&c?&W16=B_4_;~B-njEvH%j7pM= zEK4$c99`U;D+-GX^xcECLyN+Eiy|^}{X#ADOI$r8!?PW^vb}Q(Ov_v=Lju!FLi0@w zw2eZYolRU#GtFFlvmGmf@}l&;Elet_ob@N4VU(!XcS>|kDK$4Yt4h-MO$!gq%relf z46igub}KE*%MZzQ&q^xt2(C)>@<`@Nij1g;$~DW%D=jd}FE?{43@A1TkMQ*~%`!`k z^vNqSsq}SE33WFq4tGV50PnCOi=uLc;^0ExFv|ib9}^RoV2|MRy!uSD+{rvQXpfz=E*ilJZIm zk3x@%B$Kj8bnDVG6Ae=X6+(l{jT5udL(^T%0-aopG6IY|f{fi9%RNgoN+QZVEWEPn zgUj7LyaGzfO}I==0v)4VoGX0tianf4$}Cfjiz57-6SLgQ%FR;E!o#w|e2on=%qt?@ z^Uo5_s#ck%C_*% z2;{2pG%j#5O|7>yE6ok`&h_^6PS*}i@i(prbW9J8$||>rNGU2T_pPj~tcc{&)zww- zuPg}ncB~A@(a%dvkF<=+_4F ssh-ed25519 V1pwNA HYKtH5eSIXo8kMrS2Y15Dk5h1rACkzbFp2Au/2JExHc -ei3/hAN9Uars2aH62Ri6ue9N+tX29yxV0cTdxDThXMI --> ssh-ed25519 4PzZog HtprLR1voqpk5ESBcCBNUfh34Q6EsU/3K2X/8Vbth2o -vbYCsZvSXCSB20fLNGwWbUgLkPrx7aRqwMFAnWdy38E --> ssh-ed25519 dA0vRg ix/hHlYzo63deUYDx9UnW5DkJlb6bY9InUZ3uaICtmk -qjDwnXymOM0k9pgvfw/XNOVq1UoqZVdCx+vvPiPUDng --> ssh-ed25519 5Nd93w O77U44+F1MkFUQeHufrlXFagp4saKodduMmbBG6J8Ck -zriyFrdnZ61OuMBUtUIvye4vUZ4AFaySsNwTiJmeq2k --> ssh-ed25519 q8eJgg bzoTPXyLF5wiScYUKyob6E9BE5/cA22DJJhSL+jLgEE -0oXd/EqGnpxpAaKgWPHw3Keks4UEldfpbc9zMc0nrVM --> ssh-ed25519 KVr8rw g+ht9Go3cMVPAzUkxhsM1zj5CrADjKqbWNVgPTIJ2Hk -ryMzelkyfOY/IZDiE0gURovSm6fzuBsJfwr4row3J0o --> ssh-ed25519 fia1eQ K7HJ1EJQmjVeYLu6zYpTjWbUDOTZe3m1GwSIbnWa8Ck -WSFnQ6RMQMU6YXNFwEPRRymlFMTSPCW0B7wE67k8JTg --> ssh-ed25519 uZzB3g 0/9ETo7Do0PxXog0PM+/rylYK/lf3dgcv1AvVS871A4 -/PUIHJx8tsX7vb+ID7W8t/WPVoFj/6iiVRFdhs8sEfo ---- j0TLY296m7nfn9xagQQqMMYGTcLt1bn0Uu33CqNKPCg -b]P3xM{Jmu  RŘ]B(;gO r6 Z0nTR8]|T&)W̵ - M"zQ({T$\N\T=dϯw):ڹ1[*N1NnL'K9~MiJ5[H!W \ No newline at end of file +-> ssh-ed25519 V1pwNA dHoon26BhGIqe6TjYS7Q93OC2vhr64B7ofHzX8FiJxk +EcH7j44+zOHBcJOw0AwpziXtUPxOH//MGacSa7rDNT0 +-> ssh-ed25519 4PzZog CrrMq81Ep/Gm9qYcZjRJ1IpXtFGp/1XDfBCB6OSGbiY +gJ+PFL0Sx7izMk54jJr3LPvfZ9DMQP5/FjAXkRw/mkc +-> ssh-ed25519 dA0vRg r5S3Fqlmqeeeu75r9COpp4mS07YWY0HP11zby9AjCyY +DGkeIp0M6dIA4WM4KYVZiwalHjou6qzLOFUnksIPU2Q +-> ssh-ed25519 5Nd93w bm2DM8tuydnEqbcM7/aMgHtU/cnnfENGHgMgXPft414 +7bFV4Mx/gSaEM7+rJbqjjuod0U7tl8ODbK1+qY7gtmE +-> ssh-ed25519 q8eJgg 35Ce/4wweXHadDG1ryl1d53G7IxEOwOFQATYgC6WzBY +5va0fHjZXbH/2ZAFioTcmyeFCid8vrgTFXK6wR/ranA +-> ssh-ed25519 KVr8rw dyfXPAGfWlbmjpiol87idweWsU/c1v4gwq18Y/4oZBo +MiuhfBeQeMlHsi7hz0OgOiLIbFjeSaUoJ+xlIHkAmpY +-> ssh-ed25519 fia1eQ +GTfP3+0hcdmM9qtZvUw2bZ+32guClfXwRTfvOg5Tzc +8gSAdoh1DRoiD6KTpm5F/hFvT02/3bf4ayD/dICjpTs +-> ssh-ed25519 Km71ZA g3doqjZJ0GP9PgkZ5l/ePPxI3gyvILvrQAx4En6r2kA +O2lJGGq/LLsjtzwnfyUSD8Avw+5KbuNGd5XA8FwWJOw +-> ssh-ed25519 uZzB3g 79FGgQhIwzLPTKUBhv6RdT3RqBe+JRb3DYLPt5mAPDg +gp9dUDfNPnhAX75SJhFxBmyNdaH8umAQcYzjBHkPEoo +--- XZ+0tCvAK9SgY5daynCjTqE5M0N3ip+wVIg8o/18AEs +`T6,NH]*qzC'T +#\Lb0zB F̽H@ s! "z֫8j} %FEi 䅎Bf@AJq}cUC=%s&lbpˀ\_ed_su*#I6sEPnrCr2+6?;!W8lDtZ%luG~5JhvRj zK(9cj$WZMxue7YJ)O2*)O#MK&{^9r;JLqn1i6O9YY zosG54ay=|6wS!C3Lz1}y&5VqT%Y7{LEsOF}gNyYY6SK-ZvfT5l0<*#m(zT0%T{7Lg z3p27q4YJW~E3`=UN>5iXGR+N5Pc1bvFRn~62{sQ*adynsF80ZYN=!G%&khVs_AvGj zDa7PM161b?-JwS;8NcV%Shi4*ZlOrtn9oJ-zbytijZtBvsC?JPvb;W zSA#IWe8Y%{%yNr@jGU_Al)$`z9D@QQ-y-AU^1v#yloE`P^v*RmjB->6sxr+m&$A5k zDToX;F4T7q3Q4at_4PH)bTRcTGVpfFFerA+&vz;dDo^Li%y2Go^>q%7iYf{U4azFX zPxDC2&^HN9^J>H!XwuH=By~BzHW!p#G`)zkzY)%pAsRQzmMEF6r-o zt0(S%g;lEY?CdjVSMZ1_9D8^#e2ZG!nG7r>a~V>sEHYF99sAECBuYr6T|U delta 1024 zcmX@gd7Wc|PQ8hROR;IVlZSCgMo^M_WO#&YR&t=ZTZVySa$r$ju6B~AOHoipXtASv zF_&*@Vr7_Ra+IT4im_|HX<2HPQ(8n-W};(=QMqqPlzU=kWQLKxnQLZHB$uw8LUD11 zZfc5=si~o*f=NJCRDQaGb9Sy@q;Gj)xqfkpfn#>LzFW9+QBX)&gm;pmqi154yPtP@ zglBe6VPR!9S8kGNv2n6-nPE;rR;G4Qgj2AmYgk}PW_o3SiBW!0N z3jBO5($kYt{gQnm3IiNV)4~c&BP@f%&HVExpJf!U&k2gmEO$09Pc$ql*Y)6;PRjA*%F9Yh4-a+r%Pt8mNe^}`&Z#VOsSGfW2=?*P z5BEs6F!3tZ4l*zBbIUJBj{)znB8#GOg|O_@Qe)@J^wdNr{|No0(&T!7*F=}ns0_pW z+@hrN(0q3%OUu9tmjDx2UoNxEq|{Om%OaEDTwm>o(tNLCZEpkDs6sP+AKwTUQ~gR8 z|1h^mrwUU~Pju_jG7}9`0~K=9{L`G=Q;GsBe9FCwi}HfJvV9AyEOK03{L1{(11emS z>QnNPv~#`uB7C{3QmXumjEX&dt3tB06Z0*NlH3Emj0@eoN(=%F%(R^oUHwd*LQS0f zvmDW_D~+mhGEP@;4)D(__AE{gsB-cP_b4~aH*yY2cFZ*?i7+zq(XK4dcXY`z^$kc$ zEl=k%D2((@jqt0l3NAB_GR+9djx6$v^fxv1H1y<)($&>f zh;Ru{&Nt03H1_f-j<6_madb<}F*Pp;%*?j13=K|BOU!XiGc}5|EHO*w3S}(5(BsM) zY4Y{3B%kiS2an2?lGr1wb5B2*crEk>vt@MNx!u1uF6J|hD`zTXxt@A7!uofaC_{LH z(1Tw)c59?sEm-pSo}ZCV&P3-B1>G$<=h<|xFg@>Qn0J+JH=9-Y`S{~P*+a;l1Q(bhLI%IAvoNi@{gk4P-6h;X#b zO!LUg^ze4HFvu$i%PA;J3ovkX@y_)!NDlWhHbA${B%mrPKV8AsK-<(H!>A-JC8f&H zC(_G5w9GrA!Zg%0C_K0*$}ri>HQmF&FUvRFwV2D$&?m^Z*upz4Fr?5o-OD^gJEmQoD+{e_rB*-^2DnH*p-MzreG7{Zy z-eE-+Mdb>{MkZw?rrt&d>A6W+MW$hid9E3rF8(D(MVUcCK3?G^0R_3H6~0-OIj&sh ziP;5F85V_^Mj1xhMWJ5dImX$ACY9cWW}Zea<|%dL=0}33y{L?~= zEd3+1f&+6rs**$fL)^oh@-u@>3(|8P^SS&(b27p$^|c-S^4y~Q@-uxbvI@gJiVDLb zlU$6wtAfo+yiDE9gVIw2J<)9|jjD1oPFE;2ipn)k4GGXUH3}_=a5b-VG0--5F{`vp z4KsCdiS)HJ4~a;LGIq(T%;(Cr^wv*t4f8Y!cK7lR&NM0w$<0qrH1tcYC@yv`$SMy? z%MU5ZEQ$y>P3O|p)l~?#bTX)P4li(WH7yOPG)VFa4-9q7EO##q3Cu1EHcUw|HMFRz zEOt$C^W>VnbIp?TC)Z|QvC;W|Ls_D@$0+=vX0O{n{+%1;4VOKzPG+j!e!t2xKID)4 z;;j>Nv;I%5vAurwKl=v<-)G$Y3pHJYO%ANheYEt8(Vb_UYNF37FEUsBsmT;_oZo%J ctZmJE=AtcGHM3nx`c8kH(vvrV;qIoN0LN;qg#Z8m literal 1175 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5tnHcFIgn zOZNA4weZOfax70ZbIJ5~k4Q}q^0Leb4J>mhOY%+jOm!@9apWp8@JaIV*7pnZ^-1&% z%+2x1HTNA8 z%Ox-^*dW5hx6CP|Ks(v8Af?JAB*iBrInUkIz?CaG*xBF3E2-4W!zjO`)UYC`q98ZS zH^;v)CC{iVvM|gwv9dU;ydvDcFdf~t6i0)ypmc@I)Ih)TtnB3Es7%kCfIN54z%-W- z3y)ND|LpXTVo!H(&yXO0qZAVtqjau9)8ar^w|s5$h>CI_{Yr~WGc(gdv&@PpLv8(} zNXvkzO5}^a^9w42s>0mTq9WY_qsq+E$_k>&LOn_{%sj#z zgTtNN%zV*pE3`=UN>5jCb@nuO4%W`d4omgacS&~3Hp>pM@F)(=&ML~P3<@;%_4hII z$;(Xi3@zp=_6!a&@J=uCadA%xa?y|QbIUXd^UButb571JGd6Isj0#Wm%k_JTIm$FL*;L=8$jcx-tR&N-Aj37JJS3E> zO1~n+tlTrbEL=amQrp5&+a(~oGO;i%FG)YG)Gxij(ZoEYGPyJ}x6A`lYO8p=w{oG_O3lFE9kce~- z|Hz1x5@%l@r;x-fr{K^i$GiZuDu452lid82#K;^AGfxb^IT!kexCbg^==8C;0>xx+a?j7dr+81_q-0tu(62$v9mhAUi81S358?%_zhmBc~+G z(b6ro(85XIz$-nm*dV7QTszg(qAI{YC@`HX)Xz87%_}X?(JZPYGPkgx&@wE`)Fje7 zD97E*z{o2#v)nf`)3V&HG~bm=S65dd#XmCNNk7A|D#XJmC?~z3EX~QsHM7LsH77Bu ztSYSB-=!ch$+gVI$UmDax6o5))#k5_pA275TPL_mRN?4XSG|+7m}lk$Pq$EKke=W$ z^VzJ8v)p^mwC$HT6<@IVSi94Pc}<7^9PV7&QQJOm%JB^gs>13YtJZElobr-k#q(WD m3^TVjRCS8nXk?0!D1UgJnJYTKY;xoI$zf?tE2p+?-VOlz2#cct diff --git a/secrets/gitlab/runners/runner02.age b/secrets/gitlab/runners/runner02.age index 50405a419dadb2f1b9f589bb16c1a2bdefaeeb0a..d1517c4f7606a1c55fa7fd39364efbe79a7d2753 100644 GIT binary patch literal 1285 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5ziF4E4`3 zbv5<(_sBGKv-I^!Hw-DaNY)Sbsc_ZzDlKt$%uT8Y@JzGxu;8+EN%64A_BHTu4t6yw z%rMLj@z-|s&P`7W@OQ5;3of=Sh;j+_F}JLAw?MbeB%mrPKV6};!aE`5iPNi!`m%=C13%J*}w^!811@l7(;&PlFv&NfT8$jq)Zt;lx| z^UBT)ck$%%3~+a@Fm&^E3&~GPbM$p7EedhfHZ6#BG>AwF_RLM!Hjc80^2iSg2rEXn z%{#2fqNrRU)H2M{-7wK3Ezls@E4U;-+bgfwtgz5M)g&-2zskuoyV$fO*v}&~G{TXq zz}r2vFw7t=$Gs%oAlJ`0*f-VNq$Ib5(Z>MYwzSMd!_+{9 zkV^NQ5(~G;!aNi2#0=vS*ND^Bsz+?-Hs(erF0@JVz65XBk^C~cGb1w7`aSv2T$}uxHF%J#Mca91!NeRyO zC@c;NF3WKD_w-K+_lh)g3vx8hsPYfWGO*xEDaa`)2=wxf%t%biHTHH3aW(ZY392+R zEDUpXbq_Skb%}5dcZqP$EXPPCrBPK*#_0-KhTfLBeul2$E{;AHp8DQNk*=w(Df(re z7JkkFm1$wwo;gvDDXwAK?&(~4xo(A-X{CPdQN|?!t`Su^*`*f6W`4%`C1J^x?&W6T zp%zBkuHmj}DHdG1y1EMC&i)l876pL@mfj}$mTmzkKM}AGjwskcG~WKpOmJmRW6%djFTj9_=mt=^8(lY>mf7cG;eb`&D6eh z{m`*nUF+AF7j8{@Ipflc+Cz^8zD@~9|5$OqEB^D;~&PKP*B%mrPKV6|Lx6(YkqRh z(4;W0Ksz$i$o(g?OZoA&m?cp#AE~Qz#OM! z*RT**gW$wSuMo@JNS_RSx1vgROS6(plgc7eobtI+g0x*yOdTt|Gs2QxlB4vq^*!?(!z{uxEHaWU!+cUh)5|Lg zavdGZD_zlTE3`=UN>5iP^h!>1t&GaC%#SQLF-kTL42m%E3@QkBEh_O(^2~EBjdUuh z3JHxgG>YWPDD$(-&MO)IW+%F%WXii-5|$|{a>^)E-a z%{#2fqNrRUKO?dCfU&x&NOf<&*tKtIpi zL^nULY=7gjyqqvI%K{U>%)+32XGaqQUyqcmjI7i!&rnZv+nfviL)-%uj7s#&!z)tU zT_asA_5Fh@(hZEu3r&)9@?A~RN=nU>jSCDCJ;M!h(!=A@vt-w%kuFu4RSLra&dPLGA@WLFAU1(($5TcO3p3uHqJLP2zIIRHV(}fFe*0miVR8j@(FNvE6(>XayJQxaXf?y$nB^M9wccxM+d>@ATr1b1|ph-2Sbx zqUa8LQPm&rhl^%%h45Uv79sp$w@Ao?hO>Odyvf|p|Ez5?y63jTZe;+M@u3xBOAfy{ m{!(k9YvCNsFHV diff --git a/secrets/gitlab/secrets_db.age b/secrets/gitlab/secrets_db.age index f5f2ba7ad2cfecdeb88885744f964097e584f15e..12efa5dbdef3496b013a11051ac21c5436b03e98 100644 GIT binary patch literal 1221 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5!v2^o?{% zGA%4mcMH@G3iplDHVgI1jZAe9xAZqi^a=?oFiZC>4=~QpFyS&Ua!*b3F>opJ_qEI| zF)EMD^0Lr(FV`;*^$AWdi%3k5iU=_G4$wDDN=CQMB%mrPKV2ce$j8sqJR`K&&(|o# zJH^qx!Xm0PI3nFKyRgD1)lJ_o+u6dxILO)E(S$48B{I27Hs6i0)ypmYV(bR%C==cEibqf+;z9Bq@-tV9d* zFyAmkladVAbf@rA3pZo)aHmAauyn2{gL03=@}L0EqLe^y(_oLVBKN#Nzpx^=Vwb=G zN3$v)?d;UZeCM)|ykd0QO#Mag%oKlLyTuiHiLL;3@v%F0c zLsES!vM~HsXp!obp01GT6Ic}BpBU(F>S|$gj$_T2m$c{?13@#5z4T~rVu1E}Z%5sfJE;PvZ3B>SQuDM~9qk?6DL2*u+QFdaA zeuX-;N|ktu%Z z+U9}9DVEv(-r=4Vfn04dPww1!e2zUj{m15iK^m(o3|u-i?dAXPnsb?tX|?5}=-?x( zR>>#1m~ub;vDnOI)0ZRbz8n*-+jiyb^py24mN(qu4Q%1{I@28UeCm_EYg{Bu*^m7e zzJ5i|=&z6CjTv#v8{RV*7sYOq&PrK>?zK)734iDyb~V!3u=R)M)&ey&ACezK`+UR1bK zF;}KbSxJa-Xn9s?K$?YbP49`1!DRaM2QW}#ulo}SM7W|ie!Iffxo zzQN^rRc5JXe|(RqjTXF22rgmY#WmrYYWr9+nZM0gjH7;~B-nUDE?nvx+Mn zL!ErG(gVr^bAvt1yu-56{fgWi%_EIMGrdb4L$k693o3lMaziT%@&mjAy(&yB{agYq zQ;Soo95W5PlhVqQvjQXBBNEL$1Dq^F^n)EIpJf!Uca2KV4-L*Rcg`v{(GN>?FSqbB zPjPimbW1LDG;>Qz@lHz#$t=nVOmp((D)%vU3UhKd$qDl+&C)k6&vvRbkJJzFjc^II z3@-By_RGyM_YNyJEb_=kj{)znB8#GO1y{=yGwnj>R40pIlc;e2s-*geG{2zqqR2Gw zN~6NG$Skv{5X)rWG&jfaY%cc_zfxag7pKTd(~wHHDC5L(OLM2JpiIxAV5jUT{dCg; z(azl;F=WOVD&G7}9`0~MkS14{}E%gTaX-NTZ+yn-u2wJm%ztIET3TuSmYL-fPU z>didzE6R<1v(mXzyq%m~O2V}R(%ig*vdbJjGR*S*{0a<F%Fb<`^8Bl#=XZ>f{pQ9OPHzXI@$u>Thad>SkG0 zQOp&dQEcJo7FO?;9~xy|9%<_4?VVzrU67M(krd`xno?E~8d@1;;8>L!k?PB(tE;OJ zY?h13Bm>ZQ?>To)-ql`!a}@lm&S$L2X@Qm_(>}K+hTgy;r+F~ zDS6kf9{A1vByj1YzS|94^Ij|np6%m*&gWNY{!QM^hitySTqNp|lFzzoV#D^9E85cx MH8YpmJxV?W0DuE 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 diff --git a/secrets/gitlab/secrets_otp.age b/secrets/gitlab/secrets_otp.age index 013859e12c46a550ed2dd6f6b1c32341c7a353ca..e2f666b1f6d59a7fae19074bfcfad3ae745c1ea9 100644 GIT binary patch literal 1220 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5!s$%nDER z4oUI|_st7Scg@d<4E9S7u5!yQN)Gf7Osw>BDG18;@G|!e59IQ9OHU0pGtG%GFf}O; z^9%~CGR<-~a4&IAHp>X`^z=3hjf(UL%Crcp@|igOV{8IBg z<1{nFtO#?%!r;tur$BVuO#M5iX^3%@=^tLdI3e`7qEpkdqEzM5x@y|^TH#RlRE6dWh4AJ+_ z5BG5{2#n-%%5~Qdt}-;PsxmPPNKOmajxZ@NDXGjhjta{ub4~RM^))nbPR=bf%QQi^ z%{#2fqNrTKGBY*Dz`(UUC(1a=BGoB0$}!Qr*wWJ?ts>jVw>&l2)U&d}BrG`9up*Qz zKhGf8$k;qL-_zM3C!`=R!^AAr(4wrY%G5I?FjL>atkAVM&s{$>+Ylq((lQebQv(%3 z41@J^{M}N^lk@W|OiNuH^*s%eip{f(4ZKP#-Mv%&%iUee3(Q@Ea$ULd++Cbav(0iX z(t=X83v%>*j8hUTjr?-W^mAQFDKC?#ZQ{=A9C0R8iuZRhjGKTvBA7 zW~?6^>6Yu~nd??*Ug%StVo_z`=$_{3Y=LfDX;hVyak_$jT3}UVS*DA3Ua7HVWmRxQ zie;%!rdMQWrC*qKVL)J7hJjzGx4XGnxi6PXR8nA$c~nWVc50MiQdCHYYhGY^S&+H6 zacQBaVUD(6aHOlVkH5BGNjaCUuC9V#MSf9=Nvc~|iM~N*plNz;rE7L-T6t)mbBei1 zVo*s^fn|P#v3F@iWgypOHNn{tVXN3Cz1&l2tlB8??$Ga}f$PpAG&1AMTwv% zESv?eR>)3f%X{it$I5#oYeh7_k(kepJuSbtWj8oYPgp7QHkYoQLUD11 zZfc5=si~o*f=NJCRDQaGv$j#Hm%pQM*bd{bRQtCBJ@N<%HPLW+XjgVS9if{h}%B2to!^veq(a}u3>ef>+4 z^F5P_(!-OqOTAq6Q*zzXd@TGT&9jpN%!)iGpJf!U56pK8%y)7MudoPCH#RWx_R1{C z%rFd!@^#L24s$UJ%Z-Zg@T&@sDs~U$@-hi3EDAHt%JeS|&PXcE2=j@E3QjEb@yhk9 zC^XG6@%A<{4=_x0OwI^Ij{)znB8#GOg=|Y>FBARrAXDSq0<(a;sF3>5uz&#n>|+0{ z@UT>iKyT-wFrR?*)I>*vVyJ=HwZmQYE%E|9 z>O<2DJj=DU4MVvc&61Ns3XAjHsw$%ND_qTror<(`lZ~THGE0&TJ%XG|jNQvUL#i@D z4NTCjD~+mhGEP^Bh{%odkJ2_O3ikI&b14qi_bB!a@+vR0%<`!!FHA}<&d$p=%P?|v zb+X_x%5t*MuF9@2Pfu~n3(G0Ub;)(A3^zB@*AMp%DoZNJGRrhJOpVH|G_f$?($&>f z2=UIUuqdl?^sfkxC^5B2&doIm%ryxyOA0dZ40rSP@htMsDX)wSHgR#}I#sZs?@i?a z<%Kgvca$(ZZ{EXZBM_e+Uvc@zyjQM2FCTh;rC0X&_qjXvT9)mY|H16TwYaBJbMH81 z^J=T@3(0q$E08#I?gP~#Z9!E(xi^om{gZBQOnUt)(}&&jz~-3^S6qC;zx%t(zWUW` zT`yHKQ=0wGnoW01XRJTan)mF4#ows~ia*1uBxZh=tax@KaLUCH{qA2=FR9EfZ7-k2 L%HD9;c3vO=LdI&Y diff --git a/secrets/gitlab/secrets_secret.age b/secrets/gitlab/secrets_secret.age index 621e1b82cae3a34d69fcfcd630e39b316b792288..54feb45bed9f268c90024e37cbfccb58ab3eb96a 100644 GIT binary patch literal 1220 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5w{5(KdJX z(GN3pa`nheuE_Oqvq%a~%MNo%^U(H4iSP+Dbt$c&8ivj{TC4GhW3G7KyVaYeVyB%mrPKV8AGFge>R+1cDXJk%#Y z*(f=$JS4-=%`H65KO{dOGcwcC#4#5kt4e+h9)Xyp`F-)%t4)BjE&5QJk%q%hT%=I*kh_rMqHH%C% z$@B~kjY#K8%1tv5PcHC@OiML1uL}1!cMHujEH5k9H+D+&%`!+yNy-h2a7^|}^EN@Z z%{#2fqNrTKB`w)UKe8gn#M7WK(xR#|*d!^^CBV<8%sC{-IKtT_J3J>R+^;awJIs?S zrL3STBqB|}z#?3`JUBSTFswYdG|bz;v9vHE(kmq=*g4B3BQZ5a-!&QCwzSMd!_+{9 zlAQ7i$H<_tH0>f2_b_LFleEx+@;rZ!h}^QOD2uABG=IPHkjijB^T2d2A8o^`#E7C2 zHy`IDZ78qC80DxC6i`y?oKafj zXc4I&VdfF(7-UkJmE~_>;i+F9nV#nFQSM_|?4uu<=5D~1=#*ueSfE|xQ&y^PZsDD0 z;%RE(lAfF8mf>ZXkyIF%R%IBHW{?!<8sv-ax6-I8C*yR5WFv#}lu$$Wh(tr}(mac> ztQ;fv;Lz}-!ZNcQ$H;8$(vZ|b_e9f3gB$~{WCJ%pw;YcQb7%MbV6%*raL3YuvaD2J zZ|~5O#MG+5!u%?yqB8e9U&mrDU0q#;JPRZJfGlrcM^nSdknE~T?=1Z=$DBlO7k7i4 ztW14>H#hAtGshHPqbf(P`3%l(XBnAfj>JE3`xeoV;~RY}KrZ&fVUc#VV>(I9pYA*? zUUmKDtH@8Sjdh6^_CC7rYWaNs+W494we)y4l^dqYaI}^e?cfrf$J{r0)%O{(zLRse z^w~SgZCECh`s>z->xC=$ip7oOrfnOWm`p_OrAK$u@%rtZ#bsZT1OaLcl<=-H|} hHGAud`^`&sZktoMU;^u6`QwEyeedHwyCrRl2LOf4p49*V delta 1023 zcmX@Yd5vR&PJK$Te~FVU`g_oI8s#A85TbQF!m~oY*YiVvopru<_ zF;_@_YCxK4Qc;nao3>-ViHlo+cSVSEq+xbcxoJqSXF*bFSx8x7L8-Y#B$uw8LUD11 zZfc5=si~o*f=NJCRDQaGaZq-#MTuj$L4aj=qJO4|i(7h1QbDdoXhD{7Qecitc2bn1 zm${3%V_s+|mxoVAuxpNGxQnY>rjNI4Rb^g*vwn7Ev2%)lMo?ZvV6MJPMPg;Tce$Uz z#E;_PmFfOY9>q?sIoYOpUIxz2VV>G95sq#l8HFZk&PgREp&tHGrfGSpdD+=qrX^lg zDgH&~Wfp~biC%tX+Lqx_8DYU5{%OJ5m5%-u>6XFi#)csg=6Q~j;~B-nvn-q=Gs8Sg z-J-N319B}*Ej-M%!(2i=J;O^9gNmd4i=7?I%F_eFLV`WHsv?ZiqXP6pjP>;meIi|b z4g5_)5>ujF41yzlEmC|-(u^ZL4RXs$%Y)M=pJf!UH_H#t_w~qfbW2W24b^w_$#?hG zPD(Mr2zJWmiuBLaHYv+A_xJY9EJ1p*e|O`=Digy% zeb353Z)b~Sm*g_jJcE#&Y_80le1Dfx)6lF+!@R8QVCSl=%Akr&AJY)uQtyn?bc4_W zKW$gTq8$CQP;~3kG7}9`0~LaTymA8#@=c1(9E;0KGqb&_ES$W3L-Q=nQ&UVc($Y)P z>dkWU9JAbwog=v_(oC|8qnt7=lOoG4BMgc{4Gnxs3_S9EDsoCH%Sf z$o4BUObv3*3Mfwu@w3Pba0$t%3=J$VDk?EEN-WQJPxXn^jw(!aOo~kA>bd-?H2#O< zr0vV%o?q(ZnRoW)wsU)%Qe?sfOYIbAux~$Te&o`gO{Gc850p);(NTT)a;f}D=A+u_ zkM+;L&iwJSC_QrP;sw+8JyaIoZxni=h0`Ou<9yzi-|DU*$0OfpxLB>zaTetWjbC4R zJm_2UrV0LkwALz2p2~Jor1C2(*WQ|Rp9WUWZs%2ek8T+pJNWOVf)Q_D>&q|tn#EID LZEhB}Zx00k447xw diff --git a/secrets/grafana/pw.age b/secrets/grafana/pw.age index 44dbbc7..f9285e2 100644 --- a/secrets/grafana/pw.age +++ b/secrets/grafana/pw.age @@ -1,19 +1,21 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA wg5YKE7/sMO2/uHVH21A5Ezp5jTGyWICQE0hjgdOPFI -0BdMLvNfdkdawh6+binpY5cP3+SUih9GqXqGRjIMuPU --> ssh-ed25519 4PzZog ig5HQ0wsF9mdSplrAA+k47YEnLKXxsq0mbLSBcuhLz8 -j7lejLu7Nm7rscsILqxJ7c2CTV52a8auuzRfuyT8tyc --> ssh-ed25519 dA0vRg A3FTxSbl06XeRXwqtSEdp8zrbNRrYEhIzxggBa87yFw -MDLSG1m3Ss7mRB1D18VL1XzEPJqUJTay2BCgRrR2MTk --> ssh-ed25519 5Nd93w 7FA1lC5wmw07jEoTAJteqj25VU9LgpS4aS+UDhfJ3Us -ss6DD0KevDM1MWr9ZtUi/ZwvRi6KxAHUvQoQlhDvhso --> ssh-ed25519 q8eJgg tynydC/TKwdRGYYFhkOUeBSQhbReny5WqFiksVBfhik -uuvgLJZGfeCIudTGb/E91YUWtMuX4Q4+dP/ixM5ppr0 --> ssh-ed25519 KVr8rw 0PrEzDMMr5NRKLPwh5FUdsK+IgmmOaR+vsjkRlaPaW0 -12tS3tR3BAEBTVQunX//RAXefZ+b422Q2uaDViMPcmw --> ssh-ed25519 fia1eQ Phy3mMJqUjc+np7zDI0UVeHEMF9aDJGBKQGeNDWWcC8 -/B5W/0j5Ziq/ToQKswSHyLaVw7cl5DyQ0PhhQK8MnkI --> ssh-ed25519 IpLDOw g8f5bCJc2CSqqNi5ZbzykknpsWFEffdEjT+ZxHkUZ3g -sSfMc85BkNYiDO7JKm3yzK+dA94qry15c/GyZx4sTLE ---- iE3MElTwsLIYXZDjxLu2iz9LU/NieS1hbcuFfMn1erk -?Q1uLL*;)!Ek.qLچ hF< ssh-ed25519 V1pwNA sIoha/7vcAIuauOaV8gQA1spz0NZWfcc4rr2zgUP2k8 ++XELN1EFpMnDsVYgPnSaRm4qduSY+80RCfEFnBPCj/0 +-> ssh-ed25519 4PzZog ffub2ZpZEkysUNemtue5UroJj+/Oxi+nIstX7/txi2w +MsvvInOvekc27UTViomCZbeikTKm1vqTKsanOpeSQ8c +-> ssh-ed25519 dA0vRg ymDF91ZONYNjDV5Gktf0at2kUkfYbPSja9iWOqcBxVk +gw7IgyRSVKfxeebADqYH7z+TZJcWIMS3g14U3FrDS7c +-> ssh-ed25519 5Nd93w n17TARvCsIOmSp0WjZQEczLCFsAVYf9lDlJDdZeqzFU +gRRE87qCSiKevHShj1k0bw+kwOVblwhMGh94WRYdqIM +-> ssh-ed25519 q8eJgg 7ZJM3hSRIaQSpMnE594tD3qsufP0IwI5ngmitx/SW34 +Yibvj3cTOT6TOHSFBgeBwpXbGNFjeYs+oNjbfP3GRgc +-> ssh-ed25519 KVr8rw O8njcmXqC4uurmzk0MLECH/pVlVqA0dqM9uL00vKlls +h1dhNulCkCc3O8GmNSt67dxK2XhibTJHxx2loo2Y26s +-> ssh-ed25519 fia1eQ NE6qJvq6AK7bIlbq7QSJqQwpGv6cgQFv/L/6MXOQUzI +uk1G8a1cECFkjbt7bjcXOYQDHcTBCQwhyqcTg3pIC0o +-> ssh-ed25519 Km71ZA wQh+XFb10AF8fdeDGM3mMJG6N43ej48QML69Xa+xFHQ +eDuMG3MT8EuzS+QCAHLUi1NhRWp67jJamSL5iUQKi9c +-> ssh-ed25519 IpLDOw wTE9a1YrhG1NqYTOBoihrNH3xt2fKOmGHvx5liEfeHM +Rv9+kBZamBTDS8XGRaTsuUW/t6p5kYnbfNyyZY5n590 +--- 2HVyulzZ1Z3kQSSDH6HN/mu8uT+u8yohmt0bpe/VNQw +M\$0giSmlgJJ_yJ<.l< c~84vGP$ ˉN{5c \ No newline at end of file diff --git a/secrets/keycloak/pw.age b/secrets/keycloak/pw.age index cb13415ecd01af9be1f42c1299432120737e7654..61651308d3d9ff38b1a6f4eb9f82a68998737640 100644 GIT binary patch literal 1134 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5zI)Gj??H z@(wA@ON{i^E;cu_Fm(3waw;n@@bcC7&j=3A%MLUua5K$u&*lot&vwhz&NVJBaWnSF zN=>Tpcgpq53=at`%ymi(4$=|??OZK5^qcWA}8%IzmUj4{lxr` zD%a$+s#IUEkZeEgM1B7%1MPIn>|(AEzakG;<21KKM_1pXA}>QDGn1kW&>BXdntO|m?-Qw+=egUdplqk_ELJq!J! z^uu#g0*cXXE3`=UN>5iPb@B@JN(?eDCLBYn-qH_1(;-2q!vVaxMp)1RA#&6xEPh@ zS|nPgho&YPdPNkurv;b=76*iByM%iN6sEbDCMT6SJ7dI~cdof%l%qn9qgSDEaJFAX zXn0g|ZnPPXvysVH^H^7b_;G0%0j;0jDl%}h#iDl855&kD=TO)n{~@(l>7s7fym z3-v3_G)ygZGRe-%t}6F2;L_FARq(d-(M~fl4hs$OEDaC$b+?Ertt!_xGOzLsNHxpR z&o3$oHp$eE$Vl->=3-QlEKaSAQ&CzuQ~TGR%T2$&_*(DXH)+w@trf4<*e4o2`D^@7 spEG-hx?jZEOu4Y7TX=UUJ^A#tK}RfX!wjxFOx%19TX!Y6zrLsn08^TGd;kCd delta 937 zcmaFI(ZDf5r#{0cJt8?f(8n?;G9@_4H7(8DG_p7&v%n=S(8Vp#BE-PRxzsh=A~Yi? zpR2?y%gM*XGs#OovCums&$L9}#WbM8-7_sY&?Cn^$tAehG%K$pFQ_CpkW1H2p}06h zH#Nn`)YQ;Y!6cw6DnDHz-!sxYE6Xy;AgwYm*vl_8(XAjPPe0kjv!pyU!X($*r>ZK{ z(=x~}!`v{PE6l{l)5pX$(#b6~peWNl#n(B)*~_sgFg)1DEF`Vaxx%&5!mXghG|MP| z;z#lD#B~1v%d8^rw1}jL3X6a;6Tj3*zc8ch^vuM9@bKL5kPu`2(29}_-%JZGlO$iS zyogc*-@J;P$P`brqQa0WV=wcPtdwHcs1nNneIt)>(f(zWN0o=9Nz7 zKI!`D!H(&UP8K;4ss5QcP8Jb{CgC~01wj_Uj)hfzt}c#TmD+_)MUGCPVdc*Lh3@&q zSsBSuK3OR~;f1-L`GzJ%uEqvAeg#f0Ik};e&oYYFhv>VR`5Tlv6%?BLmX#TVI+f-7 zI3-!;WEdKmm${f&nCpkSxw>jQSET!Lxfm5@`WS^2m{#P4R(ff>BxSm#hvc~w1^86D zx#XlJ`c;;smgX9S`W0uR$AEWOkwsCtLRN7`q;qzNn}1eRerBdeszH5fZeC(|VzOIE zVt7SxqEl*7VQ6x`b68kNF;`i(Z-%K!l1HwIaeicISy+&FVk# zlzJu=JB2w%xw@ApIwoqH=T^E#I))jUhq;u5N9hMungqF*nwOb6C+3B6F&}Yvw)>;D znSH77UJG0Cq&_*nXKu@tbQ$J6x*wRJc;t?JTfkvS=LN4eC>Ry$q#bODk!mt$mWXF_p?aV&q*qAFSMvI zjqrALEXr_qGBPQy%!x`jvTzP{sWglV@O5=Eb49n!B%mrPKV2a;CEXw^#nLdPtSZOc z-MJt#BRL{5RohVCOF!7$J>5Lt$->*RFw{FLw4AHVDLgqR&)q4kIHWK$)YQ4GvNSEI z*v~IH-`};=wK%dk!`~#))I8N7!V}%L6i0)ypmYVVs0_E{#3BpdfRu>9!tkghL*D>5 z7pK%TPmA!1{8Hzru&S~s?acI4mwc`y^B`m2$`D6W?SLG|EEA{ll8EdOXRoBxfc)gb zf~->SEQ6}R0(T4Zpk#F0O#M(-Ed5e4LL<4t%6+oa{41S(0>kn%jLj-6Tun<&UDCDljY=#FQ_EA6LJWOE z0)oQKGt$v*E3`=UN>5h^DNRcAGEdPqum}rGigZg$OY^8mD$9t>NY1XRtgx^bCtCFm}r-4U2I1%P2;- z%{#2fqNrRU(jY0k#KqLjx5`gDqR_u8!oWSUA}hc#E!9UqD#WMQ+dS9RFDKC@%p;%6 z*eE|JDy3N8tg@=2$Tg?1Fxji9)F&X`()A+q`ql4Wk?tl8P&{E%n_j zeTxGPjLWkv!-La`^gRppT??avlG0tx+}#{girw_xBAk7>Qhkj*BlEJ2Qp3y&9diSN zeRBMggCmMuvdW6RBg3 zJKfX8GrQEou*kwaqaexC)VR_!%P_2>vci?iH7p_|Br_r+BR$I5HPE6c)gUR|H_A=B z)UU`qGsrR9%rrBpqRJ$*GSU&3RHPR8j9MJ0u48MzgX?jezt28P*@Mk!Hg8SVvs zh5?DLIX*#EWo~}%*@1apRh7wH;imb<`T>=G&i>_5h9&wD9$|^uj%9vTS;jdjPUYsw z?qP}A<_3udDFr6zws|BOWEKP}~d^Rb)7a_!nDbdK8*^ zdX{IS+XfBEKu>e$R7;mAOOqhSTqjFQBa13i_d@e3Q?s<-vI@U|l(gcYG!M_PqI6#_ zZTI5x@Y1wE%R-L|qY7vL{6tUFY{SwtQwvis^QoDi~*ahZ>|s`1z$d8_dCxSB_X=Op?Wn)_6S=J{p>a><^1xQVy4FL|ZH{O4bf_-|tr%n%WH6gTsK z=<3#IeJuUccla*az2f!$OP<{3{`_joPrqAPo+1A8RE-Z`M%e0GjBOeH8IfBPUhj^% zp5eYL|J0K6w?1yL%?gxy<{7){XU4<59nTUucfJYV`}}^*rj%wyy9bF83(ecx*oyx9 z$$aX$z_z%|>dSM%XY&sHjhrg6NXcbqv!nanzn@-r+U}9aTD;}x8=sU7($^M!yZ+#g zvl5%Z#j-gc6MK}EC!U?Ya!bSs-CaRXW(mFtC{yXF*>Y#&Z?=cRhWF+P?PfEuOU*o2 f(R=rczyiyL`OFvI*a@Erd%C*HBhD*lOK1lGLV;dA delta 1480 zcmcc2`;=#bPJMV-wuMDVT9J8hM6pYVpRsA8Uu2GtewBNgXJlS!ZdE~Xj#Ft)W`S{q zE0cq>ky~!IuW`9yMu1^KT2xkUm9JrWZk1WNf2d1}wqcZixk0F-FPE;JLUD11 zZfc5=si~o*f=NJCRDQZbph=~Pw@XE)m$`{oRb@_zk6V~oP-S?QpSO8gN^x;%K&H1z zW=>{#ns=@zS8`UAvsqYSWnQL}ajt=9sQKq@MW~u3ADZybWRVfwjRV5K#nH8RqAtothelFQb1wJ0W+8NngdEOOa zf!@WH>Bg4Ed9Gew9$BTvX%((UMmfgG<<9PzVO0f1S>7flMZVdS;~B-n-Ge=|OCq$3 zeWOgAOA;e|!V9wu(w!#^m8&CoeYbsJab*SLPAWFQ}Rlx5{o@T+_Eh) z%AL#nGTkE+Ju^K5%JM8+tEx!EeQ_fG7K#8F|mj=(JpZ+HqLhPj&Kck^h-~U2=y@u zGzj;o$SkY!NDm3lNDeeXj{)znB8#GOg)pzeP!kJ3FMa1?ZC_^t6Qg>U+|0sI7gyJU z4DGB`W6yNUvWU>)^ipGYU#_4avj`7Uzr3odJbmrR2yfG3OLs4Aw@5S340l6U^FSkW z^CF`%^Stt$Ky>TUG7}9`0~P!t^wX*e3Ul*AElk5rl1zN7{1emCO7fgtqbd{K5=&jR zO-=lQ5={df4MMrRODoe0!wd_HO^pM5Q-WMfEdopO{q+q>-GahQbG=<$EK%sIt`jRHMkqFqd)zSEoR(C?9wI5|8kp zGHvgyDuVz67ypvPN;mTyKYzCn?JVEisARJu?aGR*@W}khi7evb*^%D9E}3DzhAv5| zRXLzY3Np$~aq>;8DD*8buP8_|PIC|RDbz1EGT{pJh)65e5AgMH^vch%s0`N64{$39 z2{F&n&r43TD2}x7jLh~ZORg&MF9!uvcz#x}sY#}(OGa*(L3VzITZy(yN>P|$T1iq) zx@kplSdekCWoU@8pTDsymq&WGMY&gUxocFCXOU;Nk6Bh(Qe{@9V^&bEPr0*ppl^0y znrT6~pHqGy$n5$gAGZt>_mI-`KvTo4Jg*?5z`Uv)?UE>$kWh3vKuGWIuiH@UjpmixmBU&`38oeU~Cf<3#NO*HF{!&2OY?fKH0SIBuar`mL< z>%F!ewk+&kvB320_XMv$0!jzMcg0;|*C<-POsp@->Cx030>^f3c%y6o_34ur+Z;qR zuYCUf??&~ ssh-ed25519 V1pwNA U0WP4K92oRNJ1Dz7siaR+8IcCuKO+diy9VhnuyMQ3w8 -Ral58VncypJzKyBweTNDn0uyFfmqbVBsZAgsxd16I8s --> ssh-ed25519 4PzZog ADJzfpJ3mw+42CriE25RkMq49zMrkaQM+mYO450fDBo -lkz7JlpkgOOg/clVAOJ3BBnSmo84u+hxHAqxgj4VfgQ --> ssh-ed25519 dA0vRg TbBXDcY0qSdQ8X+CsumrUV8DATgyjybFmMSr7vKcvEQ -VA0TrtKta0ObYcXio/usanpsD/cAtS/FSd6IcOLYzaQ --> ssh-ed25519 5Nd93w dFpBpeouKn6S84QDP3mvQmecCnGO1DbEFRf4IgnsHjc -9xoxDilLBwS1QxXnXk2CUaoyQs8udAZJqbgwMpj5ivI --> ssh-ed25519 q8eJgg 7bSXg/HPIYoAMK/aLs+IrN9Y9BEPUyTsIo3PLEmH4yk -l0Pe13zucVpLKDE9LnBtQMkdQQuAbR/hCYhjmji6xHo --> ssh-ed25519 KVr8rw cDXOR2vdFmc8V0cDFzJd+7024ez99Th7v+i/7aK6Zwg -av5jiCaB5Q4Pa6Jbmeyx7RFwrj/qkmIN+BC7d8IMP+g --> ssh-ed25519 fia1eQ 1VFDFHIJ58+ybs3uUVIXHMpOCweDRBH1h/9b/qfUc1Y -W74hrPdMJ8sriTxN7FMoGkY22Ba3uq8DB+H1Rb4AGII --> ssh-ed25519 IzAMqA pIdk0fdfM7FZB/TTA9EN38qzBxVO1IMgDSi03tpJR3s -f4UURtxj2/YnmepYeoiFeSVwsWo4u/YYZzPZr+vybVY --> ssh-ed25519 uZzB3g JhwS814323gjfUA4JxkPFuBfNppmI5N4sN2bLxOXTVY -Up6477aZtVmbVV0s+dAafQZm1Fk4L3zA5nGG/JOMnX8 --> ssh-ed25519 Hb0ipQ 7eBD6LAaLzBep1Ihw5ElMkeT8lYTeaQJGoYlsN6AVm8 -9QLQ1Uja0PfiQdpnB4ykW8GAXdzDZUfertdRB1V/+/Q --> ssh-ed25519 IzAMqA TPkc8WaH/jYOcTvFD43lwQR6fgnJ9bLdMJI5ns49hX0 -FoUbMUqIfkiFxk8YqwHmeVb5/k7H+0EJcFDzNZoPs8s ---- Rfu7lKgz3e8yBtCwf1rlh2lH5pMTtBeCAR2HtL8Lehw -X_bp9e +K۬Op - 8putJ[W:Q -\SWzu3Ȑc&`JTXݒRK8ͳu8[SK`[3?hT7atL1|H`nۡ;i2 \ No newline at end of file +-> ssh-ed25519 V1pwNA qDFD8i1k1rzDBYBtXj6sYiQdmfGhDfXS5vMcYRF32Gs +7zO8QwPzrrqH6JPBRuasWwUw2/O1siBySFvHSp5j0n0 +-> ssh-ed25519 4PzZog u2Eg6RB/AmN5GtU/d/WfaJPew8reKZnC8C8AZWVnYRY +5tGVoNyuPKbCQSHnEy61rfuG59t1aEY1XQRJNmuj21E +-> ssh-ed25519 dA0vRg wkxiozefM16DTQAF7Ts74MP6R7jZ0FormDqg4SJkjzs +ee9kJkSDUwm3feZhBcsUeWvG90Cy6X+qwuL/PpLSKHI +-> ssh-ed25519 5Nd93w LwnaKhjUgCrVDxj0G5WTwHuzjN+nWLApK8LBgXeJAxI +WNicDBw71xFfnSn1R9f0XeAnGPHAfc0QCj9yjHk2Ra0 +-> ssh-ed25519 q8eJgg fgH9K/UiFJaCiV/NPDu1RbkMMH6tumir0qhO0gfKGTs +bycdxFG/VHcSbd1g9Ou36sZeTdUarIG5Hyn+Nji6MHk +-> ssh-ed25519 KVr8rw 1we04j3ymB7zbOJnarg67KzI/yMiQHr1ytBS8PxVywM +Jjq2uJtOAn62PeTJX021zHgCd6yPkxRnSt4IFc/T6Xc +-> ssh-ed25519 fia1eQ 3ywHsF86PLUY5Vr4hE4DI62bsGgA3iU4QFEk9SvHWHU +TvkQ/+gQJ3DXnvpD6U+jKS4EG6kIJa+nX08nUJFs1Wg +-> ssh-ed25519 Km71ZA IG4kxxGPSU/CvwDfTjlp1hUgmnzRqK+YCYTfd1qLgxA +B3cTR3mZkipgVe9tdU4re/GYuSlSDdI6Bok7yHPhhOQ +-> ssh-ed25519 IzAMqA /eXLqE1/nW5vpiaCC+NH3ytm1XrjQPgKo2rR7igOyBE +EUsEQWWTaS3uhOu/ayZNlwYw3vY7Rb2IeYl6QOelmY8 +-> ssh-ed25519 uZzB3g 5SrR6ZP2zqFHCLeykkmpeR+Km4/4ml2AcPnOAxgpq1k +BD5IXtf2/S+ME5mPHPu/yQVqQ02+aivLLV84fBSeq+Y +-> ssh-ed25519 Hb0ipQ 5z6PimjHhHU2bXtloaoYqcJk0/S/mrmXqs4u8TJjPnE +2I+d+g8Xivns+fT9W9Ws6rYCcMXJamuZ+uBnXcukcFY +-> ssh-ed25519 IzAMqA ZwdALhB/2dqaFC4bSqgXNYPbN0hgUKdEmyNyDpDg3F8 +ukgzLa7A0bVryf4GEXtqbAU6uMlEiZC6ZYnNgIdbPAg +--- XF4TF6aDYrTOXdaLTJgns3ZMeVVCO4OO+LSIczz8vag +nX~' #WY!&XsRBȻgiGʶ7}[myzug]_~:9u(y.v?r4e:0?7,ϻK5dP?40S3a G]I)RN! \ No newline at end of file diff --git a/secrets/nextcloud/pw.age b/secrets/nextcloud/pw.age index 1e381170f4ea55290d3993a2b167a7b92b09066d..047db6e3abdcd742bebb451dfae43c1126a57f22 100644 GIT binary patch literal 1134 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5uyptMW*S ztPF5*NiVbv&&l-3OEt@NbE*jSO7?WmG0O2baP`km(k{-;GvLxLu&63daw|wR^~;Vj z%c(TZt;#KTtMUm5F$)WD_OEabb@ojPs7jAY^+mVMB%mrPKV2cCG_9zrJUA=NBhxg^ z)1oZHEv2xk)XP6FF)2ALJHWsqC?h{PFuBsm&4Q~aJKRuTKgqk?Jix`(u{gBQBginw zJJ-n~+$%IU$;>3Az&xTLD7`e*s~Fw36i0)ypmc>&?GV?LY_}xC?Bt|;w;&gzoZ{3l z&-C(&pa4gsP!Df!*V0IXP{%AwcMGmu(;&Apx8R~8i*m03ePg%MP}fM4(!3xK=agjk zRKF5kFaW6=(2&y!#%1ulTFUyE>^YRUFEONK3C<;vsH!28sbIG#I zw9GcMaCGD<%TG*B4i3sR_X;X2&hZUQGPE!W({^{y@Nv&eN%J=FtqiL)4Nr-13Bw3U z@310^qH+c8WS2tsh$Ma2@I>QM0}~$~^Wd_G&rUoiF zhPh`uRizsk8wOOS8U(sj$?~wr6oECgm^iJxSN!fq(y}qxI}UpC#G9Er<+&h zRQM$Oxf>MwS%w9sxdr+adE|xp7r9oMBvwW`7F1OldzPcy=ACP980Dy7W{{d^6lLjC z7Le)con+=5o)l>jrXS&NYV7C~;q9N|tY4m%ZI&3E>EX#`>8c%2V(Mv-7gXhF9ugE$ zUgDbQ5oG36>=a;VT9F)Rky~V$onmGdP~?biTclfJg>$-skCBU+nPX9ecWHi9Xi8*I zk!f~ia&Az1v6-v8VTNIpepMJ3lqhpwP=B zE8on|qAVhrt2`s8L_4x7)H%5%KitJ7-PFa$c%#Y)S~ntZ?*U(5V?cxBJ zWZyhf(fi9`0RZiuV zsd*`7`bAzr$vKwV7GcHCk!~5mY1%%3uL zmN``+C7wp5PUbsMP636 zQLs^!r%z>Gs)u=yTcCMXGFPF0nyFb@sCikaPikdgQf`oCzOj+NS&^$zL7r2gd2v#9 zva?fmSd>qh0lIZ*nTdv}feMbP<(Zxy{%(%t?#8A1f$ov+K2BA^X-V!b8O7#-kx50B z^+h?6h870SVHRA*sm@itl|exUM)?-Od6AW29)4~fNqMD_+UZ3(Y0f#WRhDK2nZ>3q zZlUPbMY<(cIHxO^CT4jB<^`o17U=uvrFVk# zB)Yl>rUs|@Cb^lXnUt7U1v^G~`sfFQ8y1C^`y{%i8JD^FnPe0e`{-M6g`bv|U8BuW z-^g(8%X!P~Rgd&_Th@o3{wjdB6}eA%1on^rrn7ukAErv0CtW)1ONa4 diff --git a/secrets/secrets.nix b/secrets/secrets.nix index a69d2c4..08d748a 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -6,6 +6,7 @@ let thenobrainer = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKjaKI97NY7bki07kxAvo95196NXCaMvI1Dx7dMW05Q1 thenobrainer"; eliza = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIJaVEGPDxG/0gbYJovPB+tiODgBDUABlgc1OokmF3WA eliza-skynet"; esy = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINS2UR/o+nK8lNHHTj5I84ZAAp6P+ZhXqhedMfx0KHE4 "; + esy_root = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDxHpsApRyCvuP2ToGm46G308Og8lO7BYPuz+EqHVU5w esy root"; users = [ admin @@ -15,6 +16,7 @@ let thenobrainer eliza esy + esy_root ]; agentjones = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDHOxA3uYcqS5gTrG1hS8XXwehzQYAI2I4iULtU8cXft root@agentjones"; diff --git a/secrets/stream_ulfm.age b/secrets/stream_ulfm.age index 118eeb28fd4b2934879ef2ce17d157fdb51bb08e..b014d5f7da16c63976a6fbe4fdd1a0071e1ca2d1 100644 GIT binary patch delta 3235 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 delta 3124 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 delta 1913 zcmaDS&>%2Dr#>Phz{ADGyTY_MCrdji)uPJP%fiptH$9}(sWQ~H&{e;}(jcX>#GouR zk}EqgEz>PC%*WT;Bg`YRz{$WhG`KL!Ij1lv$S2ZJKRwH_FgQY6yClEdmrK`9p}06h zH#Nn`)YQ;Y!6cw6DnDJJpv)vYH!-_BH!VHG-!dXA+|4B1B_l1_$gr#`E5M}0tkA76 zA|=1lQa{&|%h0H>)X_g6-9IBN*E`iY+`OzP(cRO?ud>)HBP%u6*f-3=sKPrh-6Al1 z;z#lDY=bPFUJh+0`tIPf1|R{v?v$HjEX=mZ_6S# z|1b-uk_vzGQj@$QPou0tQ|}CC@4}?SbR&f(zUfgZhWcfx zsm2v1=7FWTIZjUQCQ%VC#${z?=J}3g#h%H5UX>YvWmU;shQ(Fkt|q>Pfv%MUWO^@CdE0H#R18a&oYYFnC1(U?7?fFt6{i%tTl!~3 z28Wqe1X(y`7KHg4YNsa}rdt|0nP(((WqCxnSR|VyXISQh+xmLLrmbw;u zmgi^(ghv>rSO%M#7ke3?$AEWOkwsCtLT*`LW^$l`f0=)AR)mF@e_4G}gpWl8O zc}{?3ut}-0vv+R3qqnDHI#+mZQl7hER+4#=Nk~q(tD}BssB4J1g}HgEftg!*xMfOc zL}8?JftP`gE4p=QnTdv}feH~WW|d}zKFP^J$w`43UKYgxW(Fq40YyPsRmti3Wm#nf zrsXcVrS4fi&dFScL1`J`z9y+TF5zkB>3M0PIT`Nm6-HjAmbpHG0p>orL3xqMY5Bex z>7kR)vxwKHIa|6WhvpVnnC4XarkZ5y=R}1V7v>sTnq_z;dm5KH8iu$hB^l*dW_xmF zC6zi=czNW96&B?rW|dS0h9z63nOBx(2bPEXri8hgBv~32__;dfW(J~rr8KI_$v9oX zLchdWyTG_2-&Nbu-96VN+sz=^Cp*G9In1Tf*|4mrFeq7sVXF~EYUeEGSwiW%0J3?aw3a(cyXkAN~x)TfvJ~s zK%!&1Wm-&;8k z%Kc3|eYqA-oBrmjWaFtUiV5=QJf7(xE zO}VLe;aJt4yxHFu>{=LdRo-~r(`m7JeQT_C%dy)CIo;ZN?U9vJ#A&zlTi)zC6R^hl zMbI}>=VzKOy;i60W^(<1ow9d^fWkAixo&zZp49Iu6N+P~$}iXufAq^b;lCHP_|#t& zWywGN%(8rUeZb55k3W{^#rOYye)A}^rlM!GYT(ArVV`%OHL{;=u<5M--zAkUJ+^+A z=H6*5Nn}!Y(3X<7?&$Wp{~~$T<_5jVYiDRt}T-dw4<&yP6hjY)*cAD|+zSTb0_*=Q|wdF@$S01{fQ+M!recsobwhY^kH9Rz| zW4T!@yC%S}r0jO0>ke)v<^8OCJH>b9JoVMln0R5vW|6ZD-{xG`uQ^`7=i$7|>?;hm z7F%_F{lo1t+3G*<`=eI+Cik4YGxzxBcqaV)m^|0-O4rPdns5GGh<$bU_( zoE!fMo>jb`FE_15`DN**rrJC8{fYAxnG(I8e33gj&Ff@1_rx9UPiL)mn%ro6=JdDH zE55<|=A6CWc9ePIl<7-t^_H$*xTm-OYus&%#nx+Cw*D5asLpEaw$R@aXS$$&MNj8$ z&h&Rve!Cf!UHEuLY(w)jxksr5<|$Waupdp8pO_Z4?03}Zz*k3#<2TDltAE(1&bYT; zab>is;Lq$R9>F+fd*RiUckCv-_FNa85hK!6{q0W5QO)Q-k?s!)WhbpW@Y&dC^YlL7 zIP>KPmX@x*DO9cTr1w!bM?=wc;do2FIJU?sa$B)vX8hZocc>d*GVFm!CVGCaX From 13aa5b37a7361a78686bf95dd9a9571a96205247 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Sun, 6 Jul 2025 23:33:47 +0000 Subject: [PATCH 089/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index a177edb..3c8228f 100644 --- a/flake.lock +++ b/flake.lock @@ -1127,11 +1127,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1751725913, - "narHash": "sha256-7/hUVgjLRZH2ZcFErIb4GuUGKGknKm4605hiOhJRRaI=", + "lastModified": 1751844531, + "narHash": "sha256-vxOybwQM2pQU0hhoO6DvsZrfB8nqLu2k5UKOBZIbOaU=", "ref": "refs/heads/main", - "rev": "c4da3e91096741dc827f3a5ac3c184160b8f1e8c", - "revCount": 290, + "rev": "764e8cd620d61ed6ca6d168cd06489e94d40b615", + "revCount": 292, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From c57f5b5f6f0ae4048ec575378e475c0978490c84 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 7 Jul 2025 20:35:05 +0000 Subject: [PATCH 090/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 3c8228f..e6dca48 100644 --- a/flake.lock +++ b/flake.lock @@ -1127,11 +1127,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1751844531, - "narHash": "sha256-vxOybwQM2pQU0hhoO6DvsZrfB8nqLu2k5UKOBZIbOaU=", + "lastModified": 1751920177, + "narHash": "sha256-m9XL0STa3cP8BmAj8xvZQfIbmhst1E+1X3OKzYIUW3s=", "ref": "refs/heads/main", - "rev": "764e8cd620d61ed6ca6d168cd06489e94d40b615", - "revCount": 292, + "rev": "b8ffd421844414b44cc66d7ef671c206072027da", + "revCount": 293, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 6ca361d42b692356a045fa0993ed3e9c890635a3 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 7 Jul 2025 21:26:12 +0000 Subject: [PATCH 091/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index e6dca48..e2f7264 100644 --- a/flake.lock +++ b/flake.lock @@ -1127,11 +1127,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1751920177, - "narHash": "sha256-m9XL0STa3cP8BmAj8xvZQfIbmhst1E+1X3OKzYIUW3s=", + "lastModified": 1751923345, + "narHash": "sha256-KfAb51GCg5Syjpc5RXC0vkOML/Q+eVzKR90dkjUdUa4=", "ref": "refs/heads/main", - "rev": "b8ffd421844414b44cc66d7ef671c206072027da", - "revCount": 293, + "rev": "e901f3ed74120cb533b6eff7a873a8cd07776efd", + "revCount": 295, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From abddb133ecccc49a23844954a7e4a63306e55e1f Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Fri, 11 Jul 2025 11:26:33 +0000 Subject: [PATCH 092/107] Updated flake for skynet_discord_bot_t-800 --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index e2f7264..cce90b3 100644 --- a/flake.lock +++ b/flake.lock @@ -1148,11 +1148,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1751397287, - "narHash": "sha256-9G1T1nJS6itGsUhZxr8e1KDIx1naTSO916QN0HyCwRw=", + "lastModified": 1752232947, + "narHash": "sha256-WW6gL8JSoJu6p+3Xnea9J8+epWtSOs3O9Sk/+Uz+ZnM=", "ref": "refs/heads/main", - "rev": "b26a7c23678fb7ad922e4b7f28330182d0e6844b", - "revCount": 27, + "rev": "379cc1d431ec8395c368dae773d7c4120bee57d7", + "revCount": 28, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot-t-800" }, From eed6c54c1ab0448f0ef9631c862c94992a2263b2 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Sun, 13 Jul 2025 18:13:07 +0000 Subject: [PATCH 093/107] Updated flake for skynet_website_wiki --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index cce90b3..4a4a4bd 100644 --- a/flake.lock +++ b/flake.lock @@ -1385,11 +1385,11 @@ "utils": "utils_16" }, "locked": { - "lastModified": 1745466454, - "narHash": "sha256-st63Yf+KzhrontRBVdlQ/TR6TXAqpoOHvP0VqEYTDY4=", + "lastModified": 1752358668, + "narHash": "sha256-B0SzdQrrOLxhafWrY+8wZLwAQndRGCiH/Crwz5ZqR90=", "ref": "refs/heads/main", - "rev": "e135e90a8ee46e57f35e6d74799a8e4ccaea70a9", - "revCount": 151, + "rev": "be0baabd7eaf3f44b723cb121c6f9f170355d713", + "revCount": 152, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 180c3bdbcbd61110f7cbcef9bc26cf40000bbf48 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Sun, 13 Jul 2025 18:59:49 +0000 Subject: [PATCH 094/107] Updated flake for skynet_website_wiki --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 4a4a4bd..36b6290 100644 --- a/flake.lock +++ b/flake.lock @@ -1385,11 +1385,11 @@ "utils": "utils_16" }, "locked": { - "lastModified": 1752358668, - "narHash": "sha256-B0SzdQrrOLxhafWrY+8wZLwAQndRGCiH/Crwz5ZqR90=", + "lastModified": 1752433143, + "narHash": "sha256-oMfwxl4i+VcYNizv2k8M5PtiGPBc9RB0Px5iCdvzypA=", "ref": "refs/heads/main", - "rev": "be0baabd7eaf3f44b723cb121c6f9f170355d713", - "revCount": 152, + "rev": "0abad978f3fd8c191d2f57edd94da405e3f816a8", + "revCount": 160, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From b45accbd9e5ab60e5b9070fc86e07b0798e0d101 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Sat, 19 Jul 2025 11:39:35 +0000 Subject: [PATCH 095/107] Updated flake for skynet_website_wiki --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 36b6290..1d8488c 100644 --- a/flake.lock +++ b/flake.lock @@ -1385,11 +1385,11 @@ "utils": "utils_16" }, "locked": { - "lastModified": 1752433143, - "narHash": "sha256-oMfwxl4i+VcYNizv2k8M5PtiGPBc9RB0Px5iCdvzypA=", + "lastModified": 1752925027, + "narHash": "sha256-APuWWdod4L3mgSBXJTukfbB8s37NvzUkju+lELUD7PI=", "ref": "refs/heads/main", - "rev": "0abad978f3fd8c191d2f57edd94da405e3f816a8", - "revCount": 160, + "rev": "917c316e7606995362b436f5c6248f058c762176", + "revCount": 166, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From f3aaa522b29512ad6051c6522b909319d2b0114a Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 21 Jul 2025 01:08:00 +0000 Subject: [PATCH 096/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 1d8488c..c4e9355 100644 --- a/flake.lock +++ b/flake.lock @@ -1127,11 +1127,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1751923345, - "narHash": "sha256-KfAb51GCg5Syjpc5RXC0vkOML/Q+eVzKR90dkjUdUa4=", + "lastModified": 1753059987, + "narHash": "sha256-e7swS3m94iVuUN6tVlrcePCnCm8E351WvxmTokOUxjA=", "ref": "refs/heads/main", - "rev": "e901f3ed74120cb533b6eff7a873a8cd07776efd", - "revCount": 295, + "rev": "18fd45d39b3a47642467dd8d64bd56847dfc45ea", + "revCount": 315, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From e3d5a6faf447571965df138797726cfacab9a148 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 21 Jul 2025 01:57:40 +0000 Subject: [PATCH 097/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index c4e9355..ddeb07d 100644 --- a/flake.lock +++ b/flake.lock @@ -1127,11 +1127,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1753059987, - "narHash": "sha256-e7swS3m94iVuUN6tVlrcePCnCm8E351WvxmTokOUxjA=", + "lastModified": 1753062779, + "narHash": "sha256-hTDomWgg3cp9fw7HyzxYWUxBAwSyHq+ocZQ2rgVeTUg=", "ref": "refs/heads/main", - "rev": "18fd45d39b3a47642467dd8d64bd56847dfc45ea", - "revCount": 315, + "rev": "095ff6f2cea5b3d35880d4a55b60930b60e3efcb", + "revCount": 316, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 9fcc01278f5ec43621f7b4b10ac527c2218f4630 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 21 Jul 2025 03:47:45 +0000 Subject: [PATCH 098/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index ddeb07d..b5b7584 100644 --- a/flake.lock +++ b/flake.lock @@ -1127,11 +1127,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1753062779, - "narHash": "sha256-hTDomWgg3cp9fw7HyzxYWUxBAwSyHq+ocZQ2rgVeTUg=", + "lastModified": 1753068543, + "narHash": "sha256-7nzgRSIXrtKFY3y9z184enq8VMnizVy91I42wsM1J58=", "ref": "refs/heads/main", - "rev": "095ff6f2cea5b3d35880d4a55b60930b60e3efcb", - "revCount": 316, + "rev": "a225c14b4fdaafe390dc8840065946d8c2a2e4b8", + "revCount": 317, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From b9903cdc7ce0f2c1d78e6b7cbafe4d8e7e8ae323 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Sun, 31 Aug 2025 11:58:37 +0000 Subject: [PATCH 099/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index b5b7584..79f9311 100644 --- a/flake.lock +++ b/flake.lock @@ -1127,11 +1127,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1753068543, - "narHash": "sha256-7nzgRSIXrtKFY3y9z184enq8VMnizVy91I42wsM1J58=", + "lastModified": 1756641335, + "narHash": "sha256-jnBhbxGjNzOKkNJHWB+yHIfMDQPrguFF2lhW1RQgqxA=", "ref": "refs/heads/main", - "rev": "a225c14b4fdaafe390dc8840065946d8c2a2e4b8", - "revCount": 317, + "rev": "3149a5f99fc927397fec18840ceb9cbe54d65ce0", + "revCount": 319, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 7b99b640055b17336f0b50a676bb39e0ca4967b1 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 4 Sep 2025 13:26:32 +0100 Subject: [PATCH 100/107] testing: WAL for teh DB seems to be working in small scale tests, lets see if it works long term --- applications/git/forgejo.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/applications/git/forgejo.nix b/applications/git/forgejo.nix index 51f2869..cfe0a60 100644 --- a/applications/git/forgejo.nix +++ b/applications/git/forgejo.nix @@ -111,6 +111,10 @@ in { REPO_INDEXER_ENABLED = true; }; + database = { + SQLITE_JOURNAL_MODE = "WAL"; + }; + # Allow for signing off merge requests # "repository.signing" = { # SIGNING_KEY = "5B2DED0FE9F8627A"; From b0fd7d3b7fe33c7cb6124d18f22c6d0ec57fb479 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 4 Sep 2025 16:21:53 +0100 Subject: [PATCH 101/107] fix: got www.outinul.ie working --- applications/skynet_users.nix | 96 +++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 44 deletions(-) diff --git a/applications/skynet_users.nix b/applications/skynet_users.nix index 2812bcc..88347a2 100644 --- a/applications/skynet_users.nix +++ b/applications/skynet_users.nix @@ -9,6 +9,23 @@ with lib; let name = "website_users"; cfg = config.services.skynet."${name}"; php_pool = name; + + custom = domain: user: { + "${domain}" = { + forceSSL = true; + enableACME = true; + locations = { + "/" = { + alias = "/home/${user}/public_html/"; + index = "index.html"; + extraConfig = '' + autoindex on; + ''; + tryFiles = "$uri$args $uri$args/ /index.html"; + }; + }; + }; + }; in { imports = [ ]; @@ -84,55 +101,46 @@ in { phpEnv."PATH" = lib.makeBinPath [pkgs.php]; }; - services.nginx.virtualHosts = { - "outinul.ie" = { - forceSSL = true; - enableACME = true; - locations = { - "/" = { - alias = "/home/outinul/public_html/"; - index = "index.html"; - extraConfig = '' - autoindex on; - ''; - tryFiles = "$uri$args $uri$args/ /index.html"; - }; - }; - }; + services.nginx.virtualHosts = lib.mkMerge [ # main site - "*.users.skynet.ie" = { - forceSSL = true; - useACMEHost = "skynet"; - serverName = "~^(?.+)\.users\.skynet\.ie"; + { + "*.users.skynet.ie" = { + forceSSL = true; + useACMEHost = "skynet"; + serverName = "~^(?.+)\.users\.skynet\.ie"; - # username.users.skynet.ie/ - # user goes: - # chmod 711 ~ - # chmod -R 755 ~/public_html + # username.users.skynet.ie/ + # user goes: + # chmod 711 ~ + # chmod -R 755 ~/public_html - locations = { - "/" = { - alias = "/home/$user/public_html/"; - index = "index.html"; - extraConfig = '' - autoindex on; - ''; - tryFiles = "$uri$args $uri$args/ /index.html"; - }; + locations = { + "/" = { + alias = "/home/$user/public_html/"; + index = "index.html"; + extraConfig = '' + autoindex on; + ''; + tryFiles = "$uri$args $uri$args/ /index.html"; + }; - "~ ^(.+\\.php)(.*)$" = { - root = "/home/$user/public_html/"; - index = "index.php"; - extraConfig = '' - autoindex on; - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:${config.services.phpfpm.pools.${php_pool}.socket}; - include ${pkgs.nginx}/conf/fastcgi.conf; - ''; - tryFiles = "$uri$args $uri$args/ /index.php"; + "~ ^(.+\\.php)(.*)$" = { + root = "/home/$user/public_html/"; + index = "index.php"; + extraConfig = '' + autoindex on; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass unix:${config.services.phpfpm.pools.${php_pool}.socket}; + include ${pkgs.nginx}/conf/fastcgi.conf; + ''; + tryFiles = "$uri$args $uri$args/ /index.php"; + }; }; }; - }; - }; + } + + (custom "outinul.ie" "outinul") + (custom "www.outinul.ie" "outinul") + ]; }; } From ddf27a279480b6e3c20dd46f4a245163be1d179f Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 29 Aug 2025 10:02:05 +0100 Subject: [PATCH 102/107] tool: would be useful to have inetutils on every machiene --- machines/_base.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/machines/_base.nix b/machines/_base.nix index d824939..632ee50 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -147,6 +147,7 @@ in { traceroute openldap screen + inetutils ]; }; } From 0c90d041e0b110ce88cc779d0fbafd1129dd21d5 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 4 Sep 2025 22:40:19 +0100 Subject: [PATCH 103/107] feat: move to teh lix overlay instead of compilling it each time --- applications/_base.nix | 3 + flake.lock | 250 +++++++++++++---------------------------- flake.nix | 18 ++- machines/_base.nix | 3 - 4 files changed, 91 insertions(+), 183 deletions(-) diff --git a/applications/_base.nix b/applications/_base.nix index c9f7f61..79a83df 100644 --- a/applications/_base.nix +++ b/applications/_base.nix @@ -70,6 +70,9 @@ in { } ]; + # use lix instead of nix + nix.package = pkgs.lixPackageSets.stable.lix; + # set networking = { hostName = cfg.host.name; diff --git a/flake.lock b/flake.lock index 79f9311..325fe34 100644 --- a/flake.lock +++ b/flake.lock @@ -47,7 +47,7 @@ "inputs": { "fenix": "fenix_2", "flakeCompat": "flakeCompat_2", - "nixpkgs": "nixpkgs_25" + "nixpkgs": "nixpkgs_24" }, "locked": { "lastModified": 1719514321, @@ -314,24 +314,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flakeCompat": { "flake": false, "locked": { @@ -364,21 +346,6 @@ "type": "github" } }, - "flakey-profile": { - "locked": { - "lastModified": 1712898590, - "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", - "owner": "lf-", - "repo": "flakey-profile", - "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", - "type": "github" - }, - "original": { - "owner": "lf-", - "repo": "flakey-profile", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": [ @@ -464,39 +431,6 @@ "type": "github" } }, - "lix": { - "flake": false, - "locked": { - "lastModified": 1751235704, - "narHash": "sha256-Jzm3KPZ2gL+0Nl3Mw/2E0B3vqDDi1Xt5+9VCXghUDZ8=", - "rev": "f3a7bbe5f8d1a8504ddb6362d50106904523e440", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f3a7bbe5f8d1a8504ddb6362d50106904523e440.tar.gz?rev=f3a7bbe5f8d1a8504ddb6362d50106904523e440" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz" - } - }, - "lix-module": { - "inputs": { - "flake-utils": "flake-utils_3", - "flakey-profile": "flakey-profile", - "lix": "lix", - "nixpkgs": "nixpkgs_7" - }, - "locked": { - "lastModified": 1751240025, - "narHash": "sha256-SXUAlxpjPRkArRMHy5+Hdi+PiC+ND9yzzIjiaHmTvQU=", - "rev": "8b1094356f4723d6e89d3f8a95b333ee16d9ab02", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/8b1094356f4723d6e89d3f8a95b333ee16d9ab02.tar.gz?rev=8b1094356f4723d6e89d3f8a95b333ee16d9ab02" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz" - } - }, "naersk": { "inputs": { "nixpkgs": "nixpkgs_4" @@ -517,7 +451,7 @@ }, "naersk_2": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1721727458, @@ -535,7 +469,7 @@ }, "naersk_3": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1745925850, @@ -553,7 +487,7 @@ }, "naersk_4": { "inputs": { - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1739824009, @@ -671,21 +605,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1722995383, - "narHash": "sha256-UzuXo7ZM8ZK0SkWFhHocKkLSGQPHS4JxaE1jvVR4fUo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "957d95fc8b9bf1eb60d43f8d2eba352b71bbf2be", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1750731501, "narHash": "sha256-Ah4qq+SbwMaGkuXCibyg+Fwn00el4KmI3XFX6htfDuk=", @@ -701,7 +620,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1750506804, "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", @@ -716,7 +635,7 @@ "type": "indirect" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1741462378, "narHash": "sha256-ZF3YOjq+vTcH51S+qWa1oGA9FgmdJ67nTNPG2OIlXDc=", @@ -730,7 +649,7 @@ "type": "indirect" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1741513245, "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", @@ -745,7 +664,7 @@ "type": "indirect" } }, - "nixpkgs_15": { + "nixpkgs_14": { "locked": { "lastModified": 1687274257, "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", @@ -759,7 +678,7 @@ "type": "indirect" } }, - "nixpkgs_16": { + "nixpkgs_15": { "locked": { "lastModified": 1724114134, "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", @@ -773,6 +692,20 @@ "type": "indirect" } }, + "nixpkgs_16": { + "locked": { + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nixpkgs_17": { "locked": { "lastModified": 1741037377, @@ -803,11 +736,11 @@ }, "nixpkgs_19": { "locked": { - "lastModified": 1741037377, - "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", + "lastModified": 1690026219, + "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "02032da4af073d0f6110540c8677f16d4be0117f", + "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", "type": "github" }, "original": { @@ -832,20 +765,6 @@ } }, "nixpkgs_20": { - "locked": { - "lastModified": 1690026219, - "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_21": { "locked": { "lastModified": 1724114134, "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", @@ -859,7 +778,7 @@ "type": "indirect" } }, - "nixpkgs_22": { + "nixpkgs_21": { "locked": { "lastModified": 1689935543, "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", @@ -873,7 +792,7 @@ "type": "indirect" } }, - "nixpkgs_23": { + "nixpkgs_22": { "locked": { "lastModified": 1724114134, "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", @@ -887,7 +806,7 @@ "type": "indirect" } }, - "nixpkgs_24": { + "nixpkgs_23": { "locked": { "lastModified": 1695978539, "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", @@ -901,7 +820,7 @@ "type": "indirect" } }, - "nixpkgs_25": { + "nixpkgs_24": { "locked": { "lastModified": 1668226844, "narHash": "sha256-G/S4FBWDAqHeBS/hfXwUCJbnaKnrQFoeeKwzvZEOgxM=", @@ -917,7 +836,7 @@ "type": "github" } }, - "nixpkgs_26": { + "nixpkgs_25": { "locked": { "lastModified": 1724395761, "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", @@ -990,22 +909,6 @@ } }, "nixpkgs_7": { - "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { "locked": { "lastModified": 1751271578, "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", @@ -1020,7 +923,7 @@ "type": "indirect" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1723151389, "narHash": "sha256-9AVY0ReCmSGXHrlx78+1RrqcDgVSRhHUKDVV1LLBy28=", @@ -1034,6 +937,21 @@ "type": "indirect" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1722995383, + "narHash": "sha256-UzuXo7ZM8ZK0SkWFhHocKkLSGQPHS4JxaE1jvVR4fUo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "957d95fc8b9bf1eb60d43f8d2eba352b71bbf2be", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -1042,8 +960,7 @@ "colmena": "colmena", "compsoc_public": "compsoc_public", "flake-utils": "flake-utils_2", - "lix-module": "lix-module", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "simple-nixos-mailserver": "simple-nixos-mailserver", "skynet_discord_bot": "skynet_discord_bot", "skynet_discord_bot_t-800": "skynet_discord_bot_t-800", @@ -1122,7 +1039,7 @@ "skynet_discord_bot": { "inputs": { "naersk": "naersk_2", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "nixpkgs-mozilla": "nixpkgs-mozilla", "utils": "utils_3" }, @@ -1143,7 +1060,7 @@ "skynet_discord_bot_t-800": { "inputs": { "naersk": "naersk_3", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_11", "nixpkgs-mozilla": "nixpkgs-mozilla_2", "utils": "utils_4" }, @@ -1164,7 +1081,7 @@ "skynet_ldap_backend": { "inputs": { "naersk": "naersk_4", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_13", "nixpkgs-mozilla": "nixpkgs-mozilla_3", "utils": "utils_5" }, @@ -1184,7 +1101,7 @@ }, "skynet_ldap_frontend": { "inputs": { - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_14", "utils": "utils_6" }, "locked": { @@ -1203,7 +1120,7 @@ }, "skynet_website": { "inputs": { - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_15", "utils": "utils_7" }, "locked": { @@ -1222,7 +1139,7 @@ }, "skynet_website_1996": { "inputs": { - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_16", "utils": "utils_8" }, "locked": { @@ -1241,7 +1158,7 @@ }, "skynet_website_2003": { "inputs": { - "nixpkgs": "nixpkgs_18", + "nixpkgs": "nixpkgs_17", "utils": "utils_9" }, "locked": { @@ -1260,7 +1177,7 @@ }, "skynet_website_2006": { "inputs": { - "nixpkgs": "nixpkgs_19", + "nixpkgs": "nixpkgs_18", "utils": "utils_10" }, "locked": { @@ -1279,7 +1196,7 @@ }, "skynet_website_2016": { "inputs": { - "nixpkgs": "nixpkgs_20", + "nixpkgs": "nixpkgs_19", "utils": "utils_11" }, "locked": { @@ -1298,7 +1215,7 @@ }, "skynet_website_2022": { "inputs": { - "nixpkgs": "nixpkgs_21", + "nixpkgs": "nixpkgs_20", "utils": "utils_12" }, "locked": { @@ -1319,7 +1236,7 @@ }, "skynet_website_2023": { "inputs": { - "nixpkgs": "nixpkgs_22", + "nixpkgs": "nixpkgs_21", "utils": "utils_13" }, "locked": { @@ -1340,7 +1257,7 @@ }, "skynet_website_2024": { "inputs": { - "nixpkgs": "nixpkgs_23", + "nixpkgs": "nixpkgs_22", "utils": "utils_14" }, "locked": { @@ -1361,7 +1278,7 @@ }, "skynet_website_games": { "inputs": { - "nixpkgs": "nixpkgs_24", + "nixpkgs": "nixpkgs_23", "utils": "utils_15" }, "locked": { @@ -1381,7 +1298,7 @@ "skynet_website_wiki": { "inputs": { "alejandra": "alejandra_2", - "nixpkgs": "nixpkgs_26", + "nixpkgs": "nixpkgs_25", "utils": "utils_16" }, "locked": { @@ -1564,21 +1481,6 @@ "type": "github" } }, - "systems_19": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1719,7 +1621,7 @@ }, "utils_10": { "inputs": { - "systems": "systems_13" + "systems": "systems_12" }, "locked": { "lastModified": 1731533236, @@ -1737,7 +1639,7 @@ }, "utils_11": { "inputs": { - "systems": "systems_14" + "systems": "systems_13" }, "locked": { "lastModified": 1689068808, @@ -1755,7 +1657,7 @@ }, "utils_12": { "inputs": { - "systems": "systems_15" + "systems": "systems_14" }, "locked": { "lastModified": 1710146030, @@ -1773,7 +1675,7 @@ }, "utils_13": { "inputs": { - "systems": "systems_16" + "systems": "systems_15" }, "locked": { "lastModified": 1689068808, @@ -1791,7 +1693,7 @@ }, "utils_14": { "inputs": { - "systems": "systems_17" + "systems": "systems_16" }, "locked": { "lastModified": 1710146030, @@ -1809,7 +1711,7 @@ }, "utils_15": { "inputs": { - "systems": "systems_18" + "systems": "systems_17" }, "locked": { "lastModified": 1694529238, @@ -1827,7 +1729,7 @@ }, "utils_16": { "inputs": { - "systems": "systems_19" + "systems": "systems_18" }, "locked": { "lastModified": 1710146030, @@ -1863,7 +1765,7 @@ }, "utils_3": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -1881,7 +1783,7 @@ }, "utils_4": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1731533236, @@ -1899,7 +1801,7 @@ }, "utils_5": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1731533236, @@ -1917,7 +1819,7 @@ }, "utils_6": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1687171271, @@ -1935,7 +1837,7 @@ }, "utils_7": { "inputs": { - "systems": "systems_10" + "systems": "systems_9" }, "locked": { "lastModified": 1710146030, @@ -1953,7 +1855,7 @@ }, "utils_8": { "inputs": { - "systems": "systems_11" + "systems": "systems_10" }, "locked": { "lastModified": 1731533236, @@ -1971,7 +1873,7 @@ }, "utils_9": { "inputs": { - "systems": "systems_12" + "systems": "systems_11" }, "locked": { "lastModified": 1731533236, diff --git a/flake.nix b/flake.nix index 3ff66a7..3053145 100644 --- a/flake.nix +++ b/flake.nix @@ -7,11 +7,6 @@ # Return to using unstable once the current master is merged in # nixpkgs.url = "nixpkgs/nixos-unstable"; - lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz"; - # inputs.nixpkgs.follows = "nixpkgs"; - }; - # utility stuff flake-utils.url = "github:numtide/flake-utils"; agenix.url = "github:ryantm/agenix"; @@ -97,7 +92,18 @@ meta = { nixpkgs = import nixpkgs { system = "x86_64-linux"; - overlays = []; + overlays = [ + (final: prev: { + inherit + (final.lixPackageSets.stable) + nixpkgs-review + nix-direnv + nix-eval-jobs + nix-fast-build + colmena + ; + }) + ]; }; specialArgs = { inherit inputs self; diff --git a/machines/_base.nix b/machines/_base.nix index 632ee50..a8f53ff 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -19,9 +19,6 @@ in { # base application config for all servers ../applications/_base.nix - - # - inputs.lix-module.nixosModules.default ]; options.skynet = { From 6ef89cac05dba1bbd9933ec51f90783dfb20267e Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Thu, 4 Sep 2025 22:14:49 +0000 Subject: [PATCH 104/107] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 325fe34..81c5faa 100644 --- a/flake.lock +++ b/flake.lock @@ -1044,11 +1044,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1756641335, - "narHash": "sha256-jnBhbxGjNzOKkNJHWB+yHIfMDQPrguFF2lhW1RQgqxA=", + "lastModified": 1757023884, + "narHash": "sha256-E+lp2PyQo9vakrwAjcB+krIGPi095CaAbZ/49tWvCtw=", "ref": "refs/heads/main", - "rev": "3149a5f99fc927397fec18840ceb9cbe54d65ce0", - "revCount": 319, + "rev": "7526a82bb7c384c16a09992458868b2f669ed279", + "revCount": 320, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 64ece3c0fda7f3175c0f885ebb0fcacabc4c5d51 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Sun, 7 Sep 2025 17:29:47 +0000 Subject: [PATCH 105/107] Updated flake for skynet_ldap_backend --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 81c5faa..45e958b 100644 --- a/flake.lock +++ b/flake.lock @@ -1086,11 +1086,11 @@ "utils": "utils_5" }, "locked": { - "lastModified": 1751234352, - "narHash": "sha256-OeNGbd3kn2jjJq9nbNcLq7wquc8leOyWkahuWopKnv4=", + "lastModified": 1757266039, + "narHash": "sha256-EAXz2LRlVMEN5RA/TmhSNaF/ox34cVmdayJj+rlU8lg=", "ref": "refs/heads/main", - "rev": "1dae2ecb2623d55c88a237d55198efd51e0fd8fe", - "revCount": 249, + "rev": "0a21ac2f5d99ac846d8dbfb91444ce2e3b0cf075", + "revCount": 250, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/ldap_backend" }, From 30c2ee5349cbd6c6d35fa5e94e9b516857dca2f0 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Sun, 7 Sep 2025 17:59:56 +0000 Subject: [PATCH 106/107] Updated flake for skynet_ldap_backend --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 45e958b..64079b6 100644 --- a/flake.lock +++ b/flake.lock @@ -1086,11 +1086,11 @@ "utils": "utils_5" }, "locked": { - "lastModified": 1757266039, - "narHash": "sha256-EAXz2LRlVMEN5RA/TmhSNaF/ox34cVmdayJj+rlU8lg=", + "lastModified": 1757267915, + "narHash": "sha256-cJA/dTc+VCjODKu5WEycBrEZRxd4STzxhpfUK2kIS4g=", "ref": "refs/heads/main", - "rev": "0a21ac2f5d99ac846d8dbfb91444ce2e3b0cf075", - "revCount": 250, + "rev": "3d882056bc78707ff57321862522ca8d1fc2a3c1", + "revCount": 252, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/ldap_backend" }, From b56bfecd4edafd9feb4221fdc564417d4f41e68f Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 8 Sep 2025 00:36:22 +0000 Subject: [PATCH 107/107] Updated flake for compsoc_public --- flake.lock | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 64079b6..3420bf5 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1723391194, - "narHash": "sha256-04UThV4LZNRHg/+GbEl7M2ginWbm8FrQ5jBVmYcroNg=", + "lastModified": 1723500950, + "narHash": "sha256-t1eApFGI+JzLIW2YToLlDV20n+Nevk1q4fZBYU1m93I=", "owner": "silver_rust", "repo": "bfom", - "rev": "fffd69b6433a2d2fd359b92e3816ae9938b3e99c", + "rev": "7f339f28442758ecc3f1697e3f70d441973664b9", "type": "gitlab" }, "original": { @@ -148,11 +148,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1741131635, - "narHash": "sha256-W65UdgryecEzfS6myQ+1Sj5P3yBCJRlGRf+fU78Ei2g=", + "lastModified": 1757291639, + "narHash": "sha256-lRv6lixWuFF9gEyriNRRveWq+AIhLDmy2n7Dfee5r2U=", "ref": "refs/heads/main", - "rev": "b5089910d0d0b303b634c7e125ac0b9ba8728bd9", - "revCount": 111, + "rev": "72d9f4cc7f59b832c0831af043943b072ce92da4", + "revCount": 118, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, @@ -896,15 +896,16 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1715413075, - "narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=", + "lastModified": 1756787288, + "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d", + "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", "type": "github" }, "original": { "id": "nixpkgs", + "ref": "nixos-unstable", "type": "indirect" } },