feat: new server for stats, ariia, danm I love this naming scheme

ITD/Firewall_Rules.csv

@@ -37,6 +37,6 @@ SKYNET_FIREWALL_00027,Add,i24-06-04_017,Complete,All,-,193.1.99.82,SKYNET00018,8
 Denied because more information on wat it was for was requested"
 ,Add,i24-06-04_017,Denied,193.1.99.74,SKYNET00007,193.1.96.165,SKYNET00012,9000-9020,-,"Metrics collection, not done because not enough info provided"
 SKYNET_FIREWALL_00028,Remove,i24-06-04_017,Complete,-,-,193.1.99.112,SKYNET00019,25565,-,No longer the minecraft game host
-,Add,i24-06-04_017,Pending,All,-,193.1.99.90,SKYNET00016,8080,-,Websocket for admin panel on games management server
+SKYNET_FIREWALL_00029,Add,i24-06-04_017,Complete,All,-,193.1.99.90,SKYNET00016,8080,-,Websocket for admin panel on games management server
-,Add,i24-06-04_017,Pending,193.1.99.83,SKYNET00020,193.1.96.165,SKYNET00012,9000-9010,-,Metrics Collection
+SKYNET_FIREWALL_00030,Add,i24-06-04_017,Complete,193.1.99.83,SKYNET00020,193.1.96.165,SKYNET00012,9000-9010,-,Metrics Collection
-,Add,i24-06-04_017,Pending,All,-,193.1.99.83,SKYNET00020,"80, 443",-,Web interface for Metrics server
+SKYNET_FIREWALL_00031,Add,i24-06-04_017,Complete,All,-,193.1.99.83,SKYNET00020,"80, 443",-,Web interface for Metrics server

ITD/Server_Inventory.csv

@@ -18,4 +18,4 @@ SKYNET00016,optimus,Active,193.1.99.90,Debian-12,Games server manager (replacing
 SKYNET00017,bumblebee,Active,193.1.99.91,Debian-12,Game server - Minecraft
 SKYNET00018,calculon,Active,193.1.99.82,Nixos-24.05,"Public Services such as binary cache, Open Governance and Keyserver"
 SKYNET00019,deepthought,Active,193.1.99.112,Nixos-24.05,Backup Test Server using restic
-SKYNET00020,,,193.1.99.83,Nixos-24.05,"Metrics, Grafana and Prometheus"
+SKYNET00020,ariia,Active,193.1.99.83,Nixos-24.05,"Metrics, Grafana and Prometheus"

applications/skynet_users.nix

@@ -21,7 +21,10 @@ in {
   };
 
   config = {
-    # ssh access
+    # we havea  more limited ports range on the skynet server
+    services.skynet.prometheus.ports = {
+      node = 9000;
+    };
 
     # allow more than admins access
     services.skynet.ldap_client = {

flake.nix

@@ -179,6 +179,9 @@
 
       # Public Services
       calculon = import ./machines/calculon.nix;
+
+      # metrics
+      ariia = import ./machines/ariia.nix;
     };
   };
 }

machines/ariia.nix

@@ -0,0 +1,48 @@
+/*
+
+Name:     https://en.wikipedia.org/wiki/Eagle_Eye
+Why:      ARIIA - Autonomous Reconnaissance Intelligence Integration Analyst
+Type:     VM
+Hardware: -
+From:     2024
+Role:     Metrics gathering and Analysis
+Notes:
+*/
+{
+  config,
+  pkgs,
+  lib,
+  nodes,
+  ...
+}: let
+  # name of the server, sets teh hostname and record for it
+  name = "ariia";
+  ip_pub = "193.1.99.83";
+  hostname = "${name}.skynet.ie";
+  host = {
+    ip = ip_pub;
+    name = name;
+    hostname = hostname;
+  };
+in {
+  imports = [
+    ../applications/grafana.nix
+    ../applications/prometheus.nix
+  ];
+
+  deployment = {
+    targetHost = hostname;
+    targetPort = 22;
+    targetUser = null;
+
+    tags = ["active-core"];
+  };
+
+  services.skynet = {
+    host = host;
+    backup.enable = true;
+
+    prometheus.server.enable = true;
+    grafana.enable = true;
+  };
+}

machines/kitt.nix

@@ -31,8 +31,6 @@ in {
     ../applications/discord.nix
     ../applications/bitwarden/vaultwarden.nix
     ../applications/bitwarden/bitwarden_sync.nix
-    ../applications/grafana.nix
-    ../applications/prometheus.nix
   ];
 
   deployment = {
@@ -56,7 +54,5 @@ in {
 
     # committee/admin services
     vaultwarden.enable = true;
-    prometheus.server.enable = true;
-    grafana.enable = true;
   };
 }

secrets/backup/restic.age

@@ -1,45 +1,48 @@
 age-encryption.org/v1
--> ssh-ed25519 V1pwNA 7yvURMKPgnbCWAE2q51v3fDFuXCivslOvDuxGIi2JHc
+-> ssh-ed25519 V1pwNA WdpvBu5B0F7lNrhIDN4JnSAGxwerkNfuMtxBmqsSbFQ
-numnCMoai7pCs0qBhsWr/CjU8FfrUeQsfq9mvMTVj34
++yqqHmppGkWlfUT1jf4xywUKCsxlklUVjFq0800bK+E
--> ssh-ed25519 4PzZog O2zDjiWrxoqWp0QYlwXw8Oushe2wwlw1J336+QksnUc
+-> ssh-ed25519 4PzZog IGKAk6Fz/Do9GVZgRq/eFtKYMMFXvgeo+ZSHmecfUz0
-oBJ9zPd7+Agc9KSYgA64Sbj0aZLJRRQS2MgnPGHbcic
+ggd3H0ArigVeax78Xx5LnFHfBuHwHGeWiO0pm9oycds
--> ssh-ed25519 5Nd93w adTzuNLU94FC3fR/uK3XsI5XZSANXZmwp6fG9ZeoA14
+-> ssh-ed25519 5Nd93w ezGlRW3CBZfmIwvVOt8owMbc37ezvSxj3How4g5/l2g
-7U4C8ZbZKsl3kdPMymoHc42k4i1Wom+wi/THXosDgYg
+Xyp4Ix7SI4+5SyDjueM+sNTu3v2YrFLX5SrkXtqqcT0
--> ssh-ed25519 q8eJgg bgfuSRzrmyVG7ewvPztde7o0QJyQXXBbvK+Rs5JdN3U
+-> ssh-ed25519 q8eJgg AEEj4tf7DQeJKK1uYFSqYt0QYRJGBMMceClF/NzbPlU
-2wABMhVimVi4Nyrfa7EWji5YClqh6GhOjFUKzcJqJcs
+qgN3HtLARKVjFE+hq75Iqt3Lis7iNllCSMIM5CbmMzo
--> ssh-ed25519 KVr8rw xQcp6gQPq/AxA8cEKjhgvQ8NBmSmXd9LN1ZBxxqSlQU
+-> ssh-ed25519 KVr8rw CGF24atSBzYxmsVZ7MIVqxq4krD0PS4cCc+oagUYamo
-gy7wbZiCsKdCUAPH82xgnxWXc/sxY2S8JKcnzzypyOY
+xNsVbh5YVwWXrSGNoN3puJTk2R1G93etQmOo8CIeK9Y
--> ssh-ed25519 fia1eQ Xh2ErHfrIvHTvUyDHmDD1X0Dxnz9bUnnRne0RYPIPk8
+-> ssh-ed25519 fia1eQ 4h04u1YB75cibHXF4R1tR2TQ1XJzc7j81nuTgrSSICI
-V3+5H/8vMWV3lriiiEd/C7lg8IcQSKkO0JrhD8KrNGw
+HU8FBGgrMBYHEC3mkWcejrfIr1QU6KkvnPhF3lOVFg8
--> ssh-ed25519 /Gb5gQ ftm+TgiEOPimzA+qsus9/rFUqTjWn/VVORIs96Lgy2E
+-> ssh-ed25519 /Gb5gQ MBw9NTSoMoBdf386nDipc8yEgEh2hcDPWaZlSygMLEw
-mzRiPpqZj/tkFvdphOWn15IHv+GhTd4vj+T/lpsXJtA
+FhgEto1Vv9i0CgInyvR1B6p0aDRDN24Nrhi9t/QmDRw
--> ssh-ed25519 NtlN/A 2t0YPeV7uzYhrIZU1TDi8xxPGvpCReUL5Rxt8sflK28
+-> ssh-ed25519 NtlN/A RiUoN4Ob8wL9fDdaJoJNbPg9U+7pRZNJgiNRoZ5QDWk
-r61bhrJj6irlo2xTU8iCJj8YzSbYWFjH8iiC88SOrAA
+SDAUVwONhx9HoOck2Qma3ZttGUvHJ2Ck8UEmQvSfYyg
--> ssh-ed25519 v2Y09A BXWbnz7DUn5tssTCFkM9cFzF4M5oj3rcFMrfhFzL5lM
+-> ssh-ed25519 v2Y09A mf03fGORjv4EF6KhJ+GHz0IdV/Ej5hhY9ST+PwVgOko
-2GVsK4gq4HIBVJWlQVd1G0kags2peJ63AfuBdOxbY70
+hRORqRlCLbuGm1m/mN4i0tG7CmHWNXF+wCvoGSEsEcI
--> ssh-ed25519 XSrA6w OJ2j5EQe69sPH+wTsiMBlopI4QmHiLsfJDQj+F9rEiw
+-> ssh-ed25519 XSrA6w K6yI67N15RFO2y8axsZPRKd3J7IQ9w/0yd0s7MVoVD8
-u/9MNFViy7TvNTA7lvBKnL/qYWlkOJrJKcSG563Btnk
+Vyrt5VnqiDw1bE2gpWBkQfjOIaUC3nQdK5F9jcz/+B0
--> ssh-ed25519 DVzSig 6djjmbfge5li1ZTlaA4Wc58xfk0Kb4EdXPxX1bPdJAE
+-> ssh-ed25519 DVzSig 1zqb411u/ru+ocwVE1UJn+0+cSl3s7924LZhPUUWkTo
-HMnnH5Cd5ffp9t+tJdhagDLoGk9HKpjI28SMQGcMvIc
+NpyMPxbB7WzBLFP8do+dhJ3fNMSv25ieICBp39zrd64
--> ssh-ed25519 uZzB3g NS2dkA9o84OuCTUSoHU7MaUMJG85vr2tnCq3rSKtTGo
+-> ssh-ed25519 uZzB3g K6DWPq3lYJVfhfnTDfwe43MOLMYp/gM0uoQDldW85Ec
-6+7gqBrSIogz7nYdDUmtS3650x/y4rmgy4ru9sOf7hY
+A6suKVUDuLX81qhN2C3DeqvZtQAySRkp2XSBHO7jue0
--> ssh-ed25519 yvS9bw /CoelQvArSJCFKTV8x/OHVWTYEsNTkbRqweqaIvlykA
+-> ssh-ed25519 yvS9bw cwe5oeORn21s5ktm3KXMZaY8reJXAlqAmtWuyoy7uQE
-TGuI9tt8EnEThL3l+wgipOtDMPPTkVTdFLpRKHGFMpU
+LgODRokOzmaoxWNC4I9kaQ6O6ZLlif2eKQtfWGBBM9c
--> ssh-ed25519 IzAMqA Hb0cVXd+8WrWJWVs6j/qxBUCOv67M+Se+v2y7470oB4
+-> ssh-ed25519 IzAMqA ofZfWGgErnXxGiV1iXuNQMYwuRC8fPexs+Esy3aygSk
-i8GWMK8uXbaODkQm02TqCn79+b1zu9Zq2W7c7Rg3FHE
+U9LzM2iwO4Fp1Ody8Zh2Shl5L7tYc6LnUgKrtHgOhbk
--> ssh-ed25519 Hb0ipQ 3Gr6C7Q1yfHWcxn0pImpI4mQjdIHJKyzSZDv+5Eo1Vk
+-> ssh-ed25519 Hb0ipQ pQKzbZN5sSrYYTSF7WdsLj2aS5LlaxM/1uVl6TyZnzY
-8WFp3fNRKFb0jxmSDNVlRM+ec4bd2O5POeY69T0bVz0
+aNcXRvhjqdrkaVGOdbJEPmCS36lQLfoFeww8ENA21g8
--> ssh-ed25519 3pl/Kw GCks2XrtAKpVRl7nC2g+q7c+Q1gqh2tSfPDHHI+wxng
+-> ssh-ed25519 3pl/Kw xCC/77p1FWABov3UxIUxS4XD2JSiJXI98ljy6iO2+mk
-iyblirNv3byNgI27599Dq6kc0ae2xaoMh7thSIoVLJ4
+XUKMYrjZN13TPH7utSzm5ESyyJm1Zz1C1mQA79fz6W0
--> ssh-ed25519 SqDBmA FxJJFJboiAe5T4TTcx7VY2brEQN5DqlQ3Ak5C03MKzw
+-> ssh-ed25519 SqDBmA JmZ6CJCLuydd/pwkIMQjh04Kl77mfnzX/LbJoujbCDI
-yLYdnZHSftMTwruQYJy1I2oWmWZNPykqxe6nlAdLTDs
+5mzTyEZ6ABDTMud8R0WAfTnOFnsXIvlXYqA5aU1ayZM
--> ssh-ed25519 UE6fcQ Y7XmsyOOMffkb7GofPufJ6d/JdVi9fg3LK17C1zL1wo
+-> ssh-ed25519 UE6fcQ N/uzTyKosxblLbPHkxMFZbIeg+C/pD4o/U7+xYhhCys
-hfo5xZcNpVSOiNuZFe1fJ8o4mPF2cHoyAoyc2LO6XhY
+oyPBYf7Vvf0cRlElGRbai5Nar/FfzIlxCrBqnlvRzRY
--> ssh-ed25519 YFaxCg 1t6GiHkJUaJ795x9PRVkDU0P0FP+RC1QEedl4qHgNAE
+-> ssh-ed25519 YFaxCg YVgmf0i7fAkwvXF3WUy3DzZq+0N+1T2Luhg51+2KslA
-o9hxn0jLFBqej4D7xJdtVCB9UnUBrCXZM5gpFbibldA
+/uT7MDEd02k8R+OF/0DyZvQuqq/du9drg3V2qe5MIsg
--> ssh-ed25519 elCEeg TunOY5HCLU87gGej0HWFm775FLsbtL+41HqYS3hgLyk
+-> ssh-ed25519 elCEeg HF9Ua3oMfKhm/YzWpXRN4B1LiaC7Ss/nXMSQCZ2iqVc
-E6rAZdQUj/Zia6i0Q32SfqugEJ3rrQt8OM9sPQ+ZXOk
+RbeYqUX3qJpCcupg2dw+gcgCx8waKB9xJhSSYBkjh7U
--> ssh-ed25519 8vZ9CQ Pwqq6eKEIf/fLLiB+j5IQTFxRXrEi2ajORzH8GQpHVY
+-> ssh-ed25519 8vZ9CQ HFNS1Z+N1xH1+XcY+xbAIysDIdRHqL2/h8d2Uo2ryAE
-nmrnjLLmUPPOgk1y64Zcfhhhm87dRg5V8GM5GIfB6oE
+jiBSRN7RMEnt9/3Xyf4MnMDeAEpLlu3B6ORYWH+4L7k
---- dBHJ3bG+te1AZd+FHj/ssxBbrCBiyl3VARjnd5F0yz0
+-> ssh-ed25519 rmrvjw /+gpmIu5L6kWmiNoVRym7zYm33xEoJgz6bkYACRog0M
-8|ÁÔÌåp™Èh1DMZ ê¦À<>‘Os+^<5E>ƒ:ËËŒ¿øÇ™ÉækâLÃØ°çùãá¹»¢]gžši`í™jþê;JÄp/€·<E282AC>•	‰^×a<@Ï}	ÚÛ¶ÞÆä <C3A4>Ÿ¢J¤\P¬Ò7çK7÷Ö	òâçÎ~µ+6NõýüÜä2k<Õ<ç^§³„9Pôi/X4uË
+maTKfbA/oxOi7AkFlyz4+8ZhCBsNXtHQaF4SJTA683k
+--- xo01QzRZ1aT+v2/7cJskTcWTWnG262iJE0l8Jt4tEvk
+¿àG$C _Ê+¢TFAèUþÍ
QöD
1¸NzŸ®'É
+b{ý½)ÕÃ÷ÂfEMx&‰¥Ÿ‰ÇhœÂáœËA9‘"§'å'v¸sLä(kþa?ñ]5j¯ßC§pï9/|Eƒ^zõÖ椀«ì);2Ô'M%Ò–:Ñ	"3æìÖ
B`Àô °ÿ²¥˜óÄø·0LJ¡ï%

secrets/bitwarden/id.age

@@ -1,17 +1,17 @@
 age-encryption.org/v1
--> ssh-ed25519 V1pwNA abYqfp05DkkiK7wdTOn+E9+FU9iX8y/UcoVNUJQ1wwQ
+-> ssh-ed25519 V1pwNA pcFat8+oFhOWSZyYBM1Ij11K5vLcrGSWGcopZTIUv3M
-BLIH6HkjumaaeKntAMm5BXC4ADfqLRh3vsq26gVB470
+NDNVRUQU3SqOPRm3N/rCMhf+DyMg21d9uAJkrqLrKcc
--> ssh-ed25519 4PzZog gNCidb7IlrQLJah7iqpLKLFzlhe/4RLk5hexSq96My0
+-> ssh-ed25519 4PzZog xwjC1NO/yqurBivCPbTQgtsavmBmOcHMrjcB/W+wy0o
-ynnNvbbit8U8CNel3cBEeel006ftNPArV+oAFNdmv/4
+zdFH8I0W4ItbKVlAW4mHIPNDPPlIwdSLnIIu/1kEXBs
--> ssh-ed25519 5Nd93w YnGe4yzhVDQD1z7Mq58KgnF2GJjkBLyiOZBmCygazRU
+-> ssh-ed25519 5Nd93w ojB2kKZWtrcbf34sdYPNKIUJ65nGskCXU4wOq/SbH3A
-dZg81Rb+XSoeho2Xbth+pIza+6F4TbAuN6s5BbP1OLM
+hhr/RyiTv0tFC/pvNHBFxFenHuVWpiW1hzVcyH8Iplo
--> ssh-ed25519 q8eJgg H9L5QhInkMWBndRYQHIQTmuMVBrMtaXqCrpEXV/hpBE
+-> ssh-ed25519 q8eJgg DA1GO1/lDUAnFI9lPoOUQ1C33SHpNGVvqAF6aZCoLlU
-QL24qbdGbfdmv2bgS1uYjRHB5fKPrfmbmMidjI9dEIg
+9Cyl198clJHzc/pYmOe3hMM4EZVi/EE6XjSlSnLeRdc
--> ssh-ed25519 KVr8rw GqmHdNfgOFKcZ6+zxKDWg/ImAVEXHTSpzDmBe8f/vmo
+-> ssh-ed25519 KVr8rw NNeHe1ExbX5I4CdibTc1772nJoiEHHcC5gs/t4v6/wE
-4u2ek5DHeDuBizYx0nRee02Gf6492fjWM8U7/HL2XwQ
+FeSYrhUeMxCWJ/DOmp66w+KJlhKnXCsBqCJ+lDGT1kM
--> ssh-ed25519 fia1eQ zYA2FI8k6675UAQn1AlwWzPV5e52dAmv/ESDFMmSQlA
+-> ssh-ed25519 fia1eQ yZVFUGXdWqNW1fnNRHTrBGN1WYoXemIkGdRwKPF613U
-rup+vtydMspXXeQQ9In4s0HQnBNY4IvqRIlIdKPVaZk
+k/7eulnPGaePxUzXtt9tHOfhOyhJlTT4pQ1KfhzTwfI
--> ssh-ed25519 IzAMqA QOiOSUOx76IICb8rSo0OxTtyZnyyA8nZ/pvuDZcVfUI
+-> ssh-ed25519 IzAMqA +TNjvQx4ee/T30kv/UyFu1rCf8aG71T8WUJj3WBnVzg
-vDUSgB6dfzKNIpA4/0PbvJ/KzcVgW9l5KqqV6rKbyhM
+3ooxsLz09cBO88/BRChFrMXpx7QjZVFfopgSEcxlfpw
---- 7Lo9nyTOtFbzsGyr/5Kanvj+yoszus8bUMWquX2rG90
+--- kRZI09vrkArnL0mRQaSvoY6bpH8OTV4nT8JbDzP8nWo
-¡Çä4†ª+¡¦ÂÐQÍ–BFY2°“$žÄ8sñ¼Ñ„q
š.U¾È<C2BE>ª5õ<35>†â–Q·yKëog§ „­8^ÏËhîú.±=<3D>Î柳ŒÉE
+î+<2B>ó
PçüÉ×:( ³8.Ðm(ªe+ÚigH
 ªWzqRvMø|¯–ý$ízâµ<דí}Cˆ´{·)qõõ¬ÂAgþÑþ`¡á*Å

secrets/discord/ldap.age

@@ -1,23 +1,24 @@
 age-encryption.org/v1
--> ssh-ed25519 V1pwNA FJbuXA9iZkVimh/bRdl2MnswKZpHkF6HmIqG/cmE62s
+-> ssh-ed25519 V1pwNA oKU5WHTVFbMzlj3VCOz8SK6HUXSMx/+O0GRBgrHz4SE
-2vP3FNg2f1ijAMwWGcLa7aZQD7/Tq8iXwf6+/bMEgb8
+UhAfuzpx+3pVzaADb8IboXPrVdjc+6nTBs58vl6UM5Y
--> ssh-ed25519 4PzZog 75e7m7A1i4/XjB+b9OozGjKttQ3VzJuoNwKV6z1xYB4
+-> ssh-ed25519 4PzZog P8oILoh4jxjLWlJ/8P6ZFo3gVnPLf/5rCXKt+VNbwno
-9/czRQ3V/Kb/8p9h3cdiXXbNBECeZfLLEWg8gR+WBE4
+Z2LPtqT7vxDVXo67vUE++kZsgR8EW/g5p6ukannudWk
--> ssh-ed25519 5Nd93w Kier0iAHycxtmgq9n5Mq/eLR2akqKB2Z/JBA2ACjaE8
+-> ssh-ed25519 5Nd93w SCPXtK32yRY9SHlXW37lWn5o3kVyGLvE25JC7OYrqgY
-HokkZ2jHa7DV6KqODEH5rF+YprwNwBIjLLFGbfXdkrc
+jXDPZBtkFaQ0zrWQ+q4t7gPXdzH3FXxi/GoGQ6A5Xp8
--> ssh-ed25519 q8eJgg cFNBrJQ1R4tDi4HTI/1lGEy44cjCDpnUXGYsXQ4daA4
+-> ssh-ed25519 q8eJgg c0Pm3CbI20Xx+ZDG21YFBBYcRXhm7XJtL4upmfQk7Sc
-GPJ3fX/AxxhUjvfnAJNREQDEGp/Bz4zvfiTWHD5bwMI
+zoj5rfYv0LlKNcqxPCEmgn7Q9fC/zglkacJ+RdRGFAA
--> ssh-ed25519 KVr8rw hzHh/c9qM7v7eFFpvD/uvCcDD12kSaTabVVA8CKosgI
+-> ssh-ed25519 KVr8rw dlnvbfFVgq8/fCJ+VVNt82McHYcCYOyej2q4Xw7lHQc
-3bwDd/aWeYWmYf8b2ko4N37XXgTP5LeP98qYXSlaxwM
+7GvA1OChHOY8H+tNtBc7t0dGX0htnwru/xiOk22uz2g
--> ssh-ed25519 fia1eQ gol262stWS/VMaXgAJNC/VK5QkNb/UHN8X2khm3PHFQ
+-> ssh-ed25519 fia1eQ WkNk6q+ujMGaMndfrj4RCUhE2UTkYze9Hj7iDueXqgE
-3eBj1/cUkTSNBGANSYp6S7IvMU+8dKKEtZxqo7kMzxY
+70nqJIlhPFLAUCt8p4c/GulYOCc45hvqKDFuh1TkaP0
--> ssh-ed25519 IzAMqA Z70Jqsw7IR9vk4uLef56F1+YCQtK2YvDC950d+WVNHk
+-> ssh-ed25519 IzAMqA 4ribVEiuHMHX7rZYHi6iiW/5BwvVvydrsBzlVgRjT14
-nXqGHPrbh3VS2DMToRKs9FxBsn8PftR6HTkeA2KXRLU
+OaEvZPbPJKAbOySo/7DcIuwM7F8Lowa8mnYSkXmKMwA
--> ssh-ed25519 uZzB3g Zrc8idjRB+ZPHq9ScsCnXDqipGM83pio/V8mO6YYa0I
+-> ssh-ed25519 uZzB3g HBpDQeuRn/7ST7n+K9V1O6uLNnbu6qinqrjO000lyDg
-JFVQ8V3Jkn8vxklAZzwGpmOcaKUd8QBDFO/+gAyb3Ug
+ACVdyMFSsJgRcHxU85ns7RVTWlKTCRbUqkvgmSr/7CI
--> ssh-ed25519 Hb0ipQ Yhn/pwNTNmMdW3L2RV2MJECEYRlAzNTYztcA5MfRCjk
+-> ssh-ed25519 Hb0ipQ zThy7Iiq+mfgOic4F8FN94LfUvxqFM/k2Z3Qrs4NNUI
-S3rkfwU9Nln8WFPSr102lX+H96wnHWVZa6z8upTRgvk
+E8HEerENg4ypEiV3PnvghUzBuL85SkWSBeEdQw7xUUo
--> ssh-ed25519 IzAMqA 8SVaC/2C2+xmeCP07Mu+/xGFSB1UXrIlVJ/i8YfQXUU
+-> ssh-ed25519 IzAMqA hvEU3NLfxGsQkA1hlwkumtgEgscd0HRcBKHbavr22Ro
-y4mt/hZRuc0+5OXFs3VjYH/Q/nEACAd30YlyUyNzSqw
+omEGJ/nRcqeXRI8HQkWD1lnabodUNSipnmedtZjNyfA
---- M8Emn3XUVeSu5qTgSbR7/93DjFawmR5iZ2qxQEJ9gd0
+--- OeFgK+AG4MnUHFFRjJYmDKDonM8qNnGZ7sQzdv9GZK0
-zg*õFŒô·ç½xÍ?¬7,¬ò”‘ïaƒ1'Ü¥ôtmR t[øVFÝl=ç+Mç¸îm᜴ÙÑj;¿Ä”Fy6—O\î<>™Ó¬µ²Òªo=¹UG#%{®ÇÛoæÛ<²Àèi*à,RO;L2Oy¤ðŠð×NŠ”¡`g‰*î$‚yÄÜ’R]-õo¼böÑ05Q/ÂXˆýk[dE’Õ_…i	é’
å­ï+KP8Kÿ
+³{J7¦¨bWþ")«û{Nð62þl”8íQ ¥A«ƒ
+-¤'qGr‡}ÁÖ¤‹#¸,	ŒB§°ÄÞž(Â~IÇm
/¬FŸ<12>>`­°RœF+tC-p—û]Í¡#òù
Œm	|Yó7Èã*„«+ô¼f{°×·úÝÆÊR­ô*X»UØl:ÉÏy²MÒ­ã–;my9­&ñ1Ëég ¬ßÀÓ‘î+1=¥ÜOÉ¥B˜I<CB9C>Ø6µÛ

secrets/email/details.age

@@ -1,23 +1,23 @@
 age-encryption.org/v1
--> ssh-ed25519 V1pwNA 69RgNRqfd9pSNuJMr88rzFViy/xYScupvNucY4jOARE
+-> ssh-ed25519 V1pwNA fUmQeNgoFbbsFaWOuoZil65Wb9QXt0ombUUaowzGiw0
-KeTB7nbTiKxS7Bl1UPZ7IoL6XlTKxuEDIaUiZyjrsx4
+f37D0PiBMFwmgUtsNmjr3GD4u9VjSUhRKRdRAV/m6NY
--> ssh-ed25519 4PzZog R4dDARo9QpqRG9qKjr2ytkpJYGq/822XdiLEBDFOMk8
+-> ssh-ed25519 4PzZog 8IbMdWcBQxNl1gJSAxDZ4wX01jU8xVcrFculOfhdW1I
-N8WWraxJ0HLAgeFM0b5BPeRB1VIP5paWO12Pgruh9x4
+qrMJW01W17kyc4+61PTUf3fYYeqiEIerzLb4Qyjomh0
--> ssh-ed25519 5Nd93w VboljaSRjajrkCp1ilMC6qvDv3+ROE670Hs1iNFKRXo
+-> ssh-ed25519 5Nd93w InDd1HzgxvHNVZAdAxoeybHI3kRggQh2dTI/abS9YlA
-zUXXzywu/SwRrqmQtNeiq0hoayNDuW18EJuRZY07Z6A
+v9ONGUDVrFSJyham1OfkxRtmPzdOBQqs9zD/u0XkHqE
--> ssh-ed25519 q8eJgg VqbE/b/ddDfl4ShxeW3Id3vjXVJBP1KZKnJVUJsElws
+-> ssh-ed25519 q8eJgg L0cOuysyQN+oBz7sG8NL8JHPvoPyKi8qSlSVan7s3V8
-y7uUlFXj1UlKnQxs0Xkixv4uLU9xRZXktmY2nID/AFE
+6uxUttvfD6gbNLdFiGxo88ZfpNucTBpCTd7OlAYdx8E
--> ssh-ed25519 KVr8rw dCG//gX7lz0frI48guiFNm9TvuoAJ1B9/Q/o4FQiWGo
+-> ssh-ed25519 KVr8rw IWOO1WfFljVKcU6WkziAvX3KaRoBZoRT9PsihqkK8UQ
-wZ+QWN+0YK6DXHCtmdxtBDmtkHtNfOBrKac3ADIxK/U
+fpK1yiGhKxlUOzhI+FP1AmEP9csPhMcBjzi14spJThQ
--> ssh-ed25519 fia1eQ 1s5iHrqZ/7TdhC1vU7qwO2Cgr9W1EQRdBwXEm7U+XmU
+-> ssh-ed25519 fia1eQ M+Z470oQzYWBwjQIqBgxBNieMeJRzoL6rc/rit1dkjs
-O8HYon1a/hcQyjEQkjL+uVIvD2aR90k+Ro830hy7QfI
+xArp+UWpskcsc9q1XEzJ+1rM55/fK4/7WL9d9oXYla8
--> ssh-ed25519 IzAMqA IY4TEBaim4AtxO4N+YJApvUlDifcJkcIrH02bUP20yU
+-> ssh-ed25519 IzAMqA Iv7rCzraDezK5u7baBxdyXOMVWUQJZpQrTc1W0bWEGQ
-lQzfhUpnEuQdBep1ZKxdzZ6kIyP2g/BlJG1WxL8SiJw
+U/d2awrDMpw6OP6Z3kEgzfpCRfmxPdI+7LjkRrBLWx0
--> ssh-ed25519 uZzB3g z/mf484FBG7MNOnAV0iGksnv+NnuEzzfcCRl7UFosjM
+-> ssh-ed25519 uZzB3g Sn4Ufi02xZpJq6zJc267P9L3rlAL6Boy2YP/kj4PW38
-a6fCYyU/6Rq3eKXecch64GJQ/a6bVNd5TJYu4SmUgf4
+UWaxsni30Z3cEH+oVRv5wP6EguVAnLvbkC9zB2xG4OA
--> ssh-ed25519 Hb0ipQ rTavA3BBHDOm1oBTOAeB/E/ZfOumL82FFHbqk1c3rlM
+-> ssh-ed25519 Hb0ipQ IgVkXC91wdBmJcoksMSAmMVn29poksBQLMOgr2xQm04
-VBPFpsqo+j6uhTwaXZtuPvzG/JNo0cS90Av1GfAsYnI
+d+fI4goKUHwn2jsA8jJzLUc0n1vHKUplsl+zG4O+g4g
--> ssh-ed25519 IzAMqA xGKLZbl6ErNlp9zH56mnN4cL/YlNakt1qFWqKhOJaxY
+-> ssh-ed25519 IzAMqA 9V3QfuSB7mbnjnYRiRG/lznwwbAqROGXGKKni+ut9SU
-iju55ngxSk4IptEnRZ5435ocDloskNIENnkYGbR151I
+nDxzIJAl7JIs+Q6YAiHbOQWXwfvQ75OATgEcp1SEKMk
---- ypGNmAjP0+RusrsXWCdDwWXJiqO6b1gnnzSyLGcQHLo
+--- 24F4ekcTgmg1WahdpZX+TsLycKdl6ulrJEGu7m5hr7s
-¶÷ÎO¨¬´˜÷Mˆ›žïhÖÆœçIt^þ=Ô½5ÒÎãìõ´!ø±1¢ÂŽo†-4+^¥à<C2A5>’†7Ê-„<>{•¡ìmªPŸôÞK†ž{T"ã…íìjdç/. 	¾M°ËÍbïä€T{Óˆüy†Æ(*ꢖyBž¦ó˃ÀU
›oßû1´Ã¦
+íŒHuˆ5í¨<04>¨¸ÿ¥c\Yo7t<37>å<15>¾¯5“e)ðíó<C3AD>/”=Ä;«->kàL¦ÎSé'õÚ=—üßN­øVæ–¼¸<C2BC> D=¾}KCP<43>â8c5Ž‰!Vn‚Üd6<04>Ö3IÓ|µ„´û3<C3BB><33>iyI>ºJ–·Š²bðä/SsrUr°‘V´

secrets/gitlab/secrets_db.age

@@ -1,17 +1,17 @@
 age-encryption.org/v1
--> ssh-ed25519 V1pwNA nvvDGnr/WMta+0XVEnUlmg8KV3mO+5zX9ZlFQZQS1Bg
+-> ssh-ed25519 V1pwNA 7I3aWhw7iw2mwJnswJkVfIQ246p80yB//uG+0sEyqTA
-YyVLxI+TxfXXsncaIyi9Su6tzh5KLTbHxHxbWhplXXw
+adGO+PNHWVXIlDQKyxSPXvZH5XFONNNPr9iLeVq2OfA
--> ssh-ed25519 4PzZog zuxuhtcAiEhrr28adZrFPK5Z4399/8gbf8aWoAtI7HU
+-> ssh-ed25519 4PzZog 1MB3obSvF4K2IHF8beEcTwZ6gisII/iXq7uGKsDK4GQ
-vR/0DkXhUQmbfdzMBVAFDd1S/87DDpg9v0gyZDVv2UY
+dVPFnOW0d/IuqNtrcLdr9AtNCWV4NYXTtVHHZS+kVHM
--> ssh-ed25519 5Nd93w CUTmUrZomxIY6wwemYIwaIBO9CFSPrcQaIWs1tUdMm8
+-> ssh-ed25519 5Nd93w CNxhP+Y45tiXD7WvDbQgo7ejsWfBoq40SygJDhksCz8
-btVGPdTgvyxqd4rYiuIXLGJcQoF45g1hx5OnTHQgCrg
+h3usonhy4UfpnSkuHw5pKEV1WS7IMvWqqd1Y6t8J1lo
--> ssh-ed25519 q8eJgg wKjpIAXn+5FAC09yengwsJmAgPVY4BSNOkzC6bdZUBM
+-> ssh-ed25519 q8eJgg yZ7BmDxy1tXK7q51r5oAFvhM9mQYHtexwOILnq/2BD8
-LUifpX/UNLC0ge/ApqC0VZ6NWwug865Gtp5t2/Fbijw
+dKwf0oHUUiVBNQod8Zbvxn/YfMnhXNZbqo3Qv5uIdME
--> ssh-ed25519 KVr8rw 0YwXdULrmM1CaWqe4ppSvn3rI4qaHpjVFxZLtE/jFiY
+-> ssh-ed25519 KVr8rw L3rQAswf0dc7Ok5AuTFlSl6fuOhcRNKI+donwmJj9B8
-GXxdfK6NU0M0tBf9Txl9M7SzUEkAoDJ6VhGQuQtDRCg
+BO7TsPdPqhxy8KfzPW0QU1qHWKd07fZSQ7TqS7+2ep0
--> ssh-ed25519 fia1eQ BoAjwSD4dQG+35NLGjPwYcENbtkukIoEVxo23A3mukE
+-> ssh-ed25519 fia1eQ aEskvIGIekFwG8z+jlK3VOlhhBGLYPsEnS/1w42cKg4
-1YAgdZedWip4daImkXA1UnHJNGu5LBF5g8t4FotjiTg
+phKYN4MjToHeljP1s4/gb42D4t6dlLnbyut24vBFjB8
--> ssh-ed25519 uZzB3g g/yGqYocU7fg27BOj75yUgFYHfYhLg5iOA490U7xpUY
+-> ssh-ed25519 uZzB3g lczlYBZbn3f39jfC1fp52EXXRYX3nDrQ2c7X1QlqbRU
-huOnWVaBT71Li8CO/NialjSzBC0jscJIE7Vddc34Aes
+eBjI6305+Zigh8+3esXt+qbmJOVJIARVPA9ROeedtIk
---- 9iDIOye0Eass4rxrC2ZcfxXu09TG0F5SQoMAi7VOsfg
+--- LOIDMgRcQ6CDPqWhDTSW0vzaTV6XggXW2/HDF2nB8fA
-õm§Od¹åŒ½xõà·o#Ï5i‰¯¢;ËYóÔÜ:>†,n,³Qô¤}K{½)œi¨XêÜU”jvS?jú(ªr@'ó†<C3B3>sç@ö çáLQ…ç<E280A6>ÅÞC^ý¯w‹<77>€XœólqŠcÑOÀ«ÆP¾Ñ<C2BE>Mnç_<C3A7>jÚÁÅÍ<L<…C+¦œå\YüëÜû$Ì3<C38C>|r”ÿN€x<E282AC>2A¹¿~
+jtFÞ©±\Ÿµþâà1¦1}Õ&QwÿwVÁNæG©z‹QS?Õ]êK£D:ÒKæ6ßó75GÙp·=ré‚ó‘<0E>›ýã«;$bN8Ô/F¹›V,ç!ŸÓJ¾¬%¡Q<C2A1>˜"²"=ozŠÔ”f‘<66>¼T€£¹ÔåØp“~Œ‚mZ„¶Ÿf÷ŹTŽ2í岪½0_Ô~âôÿ¾¹ü<C2B9>š‡”

secrets/nextcloud/pw.age

@@ -1,18 +1,17 @@
 age-encryption.org/v1
--> ssh-ed25519 V1pwNA gR4aFo/u2ow8mMgTInSPElO6gBhgig2s9Wzp+IkGjlY
+-> ssh-ed25519 V1pwNA rsxHHZv+xG+iJisNaFeX5WbKBhvjd4jntP7+peGvPUc
-mVWoBrKH7AihCbdrspCIzPjF8N0kQGDML6pkybH5Y4U
+r5WN+Sea6cecItEpql6KWiYiQL6NjIoC9LjGgH0fuZY
--> ssh-ed25519 4PzZog BhiSfpYVlUgTLX6rHisiyzLOmzrqcZ8JKDqwY1lg+D4
+-> ssh-ed25519 4PzZog /DJ29u2BYSSpk3GvrKStCQZJSGkCfIJ9Li4zQwuC3S8
-nSxNNHRYPy0C0ufqa2QMIylMr5IPlPUiDcg+d79KkDA
+S243BTRk7bfOCmQRzy5+3StzgipYEUn5GazN+lmVRZw
--> ssh-ed25519 5Nd93w +bZMaaPc0jTIQ/eu/uWWgA41UQnKveaaVjgqoIaAGyw
+-> ssh-ed25519 5Nd93w CAau55luv9BjQeDY4zppvkn1KjqgE7IjAMVSac+Mmmc
-elodhm0K17eQQInvae1tkkhFY1aPrbTdaRsviYDEBEg
+9W6PtfpUx1A0q5l4Ey0gT519Vs0qqD4c36iNDwlN0mI
--> ssh-ed25519 q8eJgg LlaIdTPw3c2H8R5mDIIam4Ygvvk5gpgPahNJvf9UnB8
+-> ssh-ed25519 q8eJgg zMdYGgPr7smwvTAIsgPjecuzjem3Lu3vEMrS37qvyiU
-BN901oRUt0j75RnQZnn4uFiLKEtRhCvFtKHug7Ikg8U
+rgm1RP21BDXYnARlxlpR7ANN4dN7BW1M10fRR9+K4pI
--> ssh-ed25519 KVr8rw Bv9wfs5KP7lvH3Bpnsbzpgzduq1xiQlwVcWndWFL7Qo
+-> ssh-ed25519 KVr8rw VB5vgPySOPVoZPoylXo+rprkWkUkdEfk84NWdGyQ5lM
-LgGA4X5MOelYhpXWfsX95J+YGjcPzL6ISlPKr9ZNv/w
+cxbbOQ4XpTbhHCa2p5mZ583A4JJfxGn+OMuMdhaB7iQ
--> ssh-ed25519 fia1eQ WaxlI+aHWQdJs2YtttcQ4TzI3aIlkmdbm21mhv71VRE
+-> ssh-ed25519 fia1eQ 3t2LnYQB9vgsj0d+Z88aiyNsJRLlM/iGpv8Eg/NUyho
-yI6QKxZ/TwXRDdaHxt6+ZVldnB7sZRGQFABnd7zeXtE
+Qq0zuWYCI3bYzmTSdc6TsTy8RfdeYqnlHVuQiKHly4M
--> ssh-ed25519 YFaxCg /V6Ab/BqFQ13K0qN1DOfaw8LLGR049s0S/FuK6dL6WA
+-> ssh-ed25519 YFaxCg a+E0mXvB794agVPpk2uCKl3UHzytGijvXW1LBzLJLk4
-fZbxvQWiPh/MH4/fOzV5trPL+B4H2o2WtVBIPuFsdLE
+VgqnvihuBnBuJ4JGx9Evu+gaKa7tE43Sg41K9rUs9/w
---- kUKnoRQARSlp+lGUNu5Zu7KztkK36VZeK9xozWZwmyY
+--- hH0UWx2WXfw7HeDUfLAVfpKFwHpJR/fjJhbt1U8euIo
-¼‚‚϶ÞãtT€‚)<29>ÊãQ*12wc¹ÍÛvѶ^<5E>ÁE~]ïÀ!³TÎÎB‰3?³
+úúþ¾5抈áÐsä&±kG}Ê”Eé»'®àá~žÑ5?žAÁk\ ÖÌï’ü<12>òl24ùÚ¶#³ê:~‡zñÖ!8ÿÿ¹*PÝ°
-§R™}ˆDÚ><3E><>º uðÃ-.¿¹<C2BF>9DóŒ

secrets/secrets.nix

@@ -30,6 +30,7 @@ let
   cadie = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIACcwg27wzzFVvzuTytcnzRmCfGkhULwlHJA/3BeVtgf root@cadie";
   marvin = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIAme2vuVpGYX4La/JtXm3zunsWNDP+SlGmBk/pWmYkH root@marvin";
   calculon = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGsmeBfh4Jw2GOL7Iyswzn4TVNzalDbxDgh7WuQotFxR root@calculon";
+  ariia = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA4kV6W1/tP/nf2ZWNhRoV1mK04R4pS+c5vdsA1n5gpN root@ariia";
 
   systems = [
     agentjones
@@ -47,6 +48,7 @@ let
     cadie
     marvin
     calculon
+    ariia
   ];
 
   dns = [
@@ -74,7 +76,7 @@ let
   ];
 
   grafana = [
-    kitt
+    ariia
   ];
 
   # these need dns stuff