Replace haumea with titan

build/haumea/default.nix

@@ -12,7 +12,6 @@
     ./boot.nix
     ./network.nix
     ./postgresql.nix
-    ./zrepl.nix
   ];
 
   networking = {

build/haumea/network.nix

@@ -1,15 +1,6 @@
 {
   systemd.network = {
     enable = true;
-    netdevs = {
-      "20-vlan4000" = {
-        netdevConfig = {
-          Kind = "vlan";
-          Name = "vlan4000";
-        };
-        vlanConfig.Id = 4000;
-      };
-    };
     networks = {
       "30-enp35s0" = {
         matchConfig = {
@@ -30,16 +21,6 @@
         networkConfig.Description = "WAN";
         linkConfig.RequiredForOnline = true;
       };
-      "30-vlan4000" = {
-        matchConfig.Name = "vlan4000";
-        linkConfig = {
-          MTUBytes = "1400";
-          RequiredForOnline = "routable";
-        };
-        address = [
-          "10.0.40.1/31"
-        ];
-      };
     };
   };
 }

build/hydra.nix

@@ -70,7 +70,7 @@ in
 
   services.hydra-dev.enable = true;
   services.hydra-dev.buildMachinesFiles = [ "/etc/nix/machines" ];
-  services.hydra-dev.dbi = "dbi:Pg:dbname=hydra;host=10.0.40.1;user=hydra;";
+  services.hydra-dev.dbi = "dbi:Pg:dbname=hydra;host=10.0.40.3;user=hydra;";
   services.hydra-dev.logo = ./hydra-logo.png;
   services.hydra-dev.hydraURL = "https://hydra.nixos.org";
   services.hydra-dev.notificationSender = "[email protected]";

build/mimas/network.nix

@@ -39,7 +39,7 @@
           RequiredForOnline = "routable";
         };
         address = [
-          "10.0.40.0/31"
+          "10.0.40.2/31"
         ];
       };
     };

build/secrets.nix

@@ -16,7 +16,7 @@ let
     rfc39-github = [ machines.pluto ];
     rfc39-record-push = [ machines.pluto ];
     tarball-mirror-aws-credentials = [ machines.pluto ];
-    zrepl-ssh-key = [ machines.haumea ];
+    zrepl-ssh-key = [ machines.titan ];
   };
 in
 builtins.listToAttrs (

build/secrets/fastly-exporter-env.age

@@ -1,19 +1,20 @@
 age-encryption.org/v1
--> ssh-ed25519 s9hT2g dgCOoedaGMAU+kk+TCYfSGhcEjkT8XOY2O1i/Dc3vW4
-7AmsZxzp5QBVAkaAzSce1axdQtUyJoqeTvLSkQ6j9nw
--> ssh-ed25519 Gr9EaQ pJD5EMbL4SJl75Tal0IVykiPIpIwBjcw867N0c0D4GI
-PzGaPo1LnRjlC6qsCxFjplSMrkoMIUFd+m0BeSKndlA
--> ssh-ed25519 3ENwVg o8/QdXUWRL9O8qaBpiZYiDE6Y+P3K539RAgSQFC/Gi0
-7YxQavzqt3G5xxXNdWa4m2R5Yc7xL3yywhnqX/LWWA0
+-> ssh-ed25519 s9hT2g RO6Blf+MB32dW1vWtwpsdutfPRDhXp6qMh+9K5mP/yI
+aojG0tr0pQ172/Sgrcm4ltdGJH5uCdW6hpgvFE/gDFE
+-> ssh-ed25519 Gr9EaQ ByRH47STTrDIIyt8d/EitsWGW2zHs3XWE44A3AJVZy4
+fhT87Y7e7J41Cfrvldh152mVTz9dD4PuaxN3S6OkXfc
+-> ssh-ed25519 3ENwVg Wk0Tt67znuSj137ODLVZ+jmYD+QZ06pnEia24XJau20
+1n5AUDJ7G4BrD4jZ/bFtmehX5wqd5nmaIluzVd+bGeY
 -> ssh-rsa MuWD+w
-UiC3Jo2FMnLWRuOiP4xp1q7a8cIKUGFw8D+jODMfDTbBwdZqyeoUf8a3WvdHmCA0
-NvCpr+CBa7ZQ4oeE9sw9iVdbsvLxR2Ny+zFfNzih2BHR/tbqSFZSZj2oTZcponWj
-h6wrAsu1QMQx0Ofpr7kco/DWMGjRofOcKQJbmoqDiKKAsf9rvzhVu/wJvaTNQqAU
-Nge6CdKT/vjALtHb2W6GgE6PY+yEbH34iGqC7KCE1nLYHIpwSGBdL9bQRsZhksOh
-JLVaure4CH7XTbdvYQVmwK9lN/6DTlxTU/hR+POD4oCGl8mv7ZaeNHV/4IN10C2v
-MWeDLGKQO37QgTt82C4eyQ
--> ssh-ed25519 92bXiA NjVy+K4v9VBBR6rcaSNVy6yLzPnOHBq+6oeefTtmb24
-IsWe5OQp9hTOGYkmxMCnp+z2XRxuOhJ6xTVbc+Ucu5Y
---- SflrB0oDOkbOfGHFTHV+lm4ruzKfrPiSC6owWmx3uGA
-B�����t(J/&:�n��KTb55�	e
-p�]N�0�1DTk��@#s}�*�'�
��W:+�F��C���p\�qz��_�sl
+swfRBQIzsOuJe0NW1fjEPTNbCNdDCj/tvajEZQexxZV2koyXzCZMZu6WkUE7EWIQ
+9dg3dN+SgIBDsBCimVwDLdlKCv07Y4EYVJcUKWQyGrCnyKD0fNL+H/b0NFvkln5d
+xpWShnL/zTEa/Bz/1ftzTcDV4B6g75HyIrfXnc5yNQPsk7w4u+tvUIZFiPsUkwj9
+2raYpVSZG07xPxDDujADlNLuVNhTCw2MxN/cUS4u7iN9cMilFwND0clRVjQl4APe
+Wnzb5iZ73sMi4wg2Qf8+O//zxe9221krnpjhdkyR3k8Oxk4SPACSxuLKKXn5PVcD
+Gi8C3sxSSTLzpwAqySR94g
+-> ssh-ed25519 92bXiA TXBDrIkPKkagHD7cvWsD0BkE8p0pJYIK5LaCCxDvzF0
+gpkhwY7kVYK23ALcahfAucaOP2Tf6UJ9QuFCxbWND3k
+-> ssh-ed25519 Y121Gw IMc36vETqcH985olPop763Y/SIPl0GdRDecUFlmqU1A
+pWOPIMjlWkKFMxZAhnBNu5nmTn0YA3/pss3vcr2uEvU
+--- 0bm0YdyW2rphnkhcSz3jjdUe5eyELylNp4MhcSmAkdU
+��`�N��LS^ǩBb�ܲf���E�V��[��oI�/����JZ_��^bYQ5�CDў�Qg�~��4_�aه�dկl��'$

build/secrets/hydra-github-client-secret.age

@@ -1,19 +1,20 @@
 age-encryption.org/v1
--> ssh-ed25519 cKT5Kw 1zlvdl0Xt5hkKoRGtfGx1QHrN0eMVUKyuYPpll6gRkA
-lCC3BPZ4YLIFF7RjFddc3Yd0PALE6psxoa83Gm9/CTk
--> ssh-ed25519 Gr9EaQ cN7AQqu403k31C+Gnmir2cVovC5aEAiWI64Wx16Szk8
-77+c7wYsYi5UBiCdNYDjT912SnvQxYKoP8CaVePG2r0
--> ssh-ed25519 3ENwVg /XcvirXeMdnFwrWOl6vCBalahXht02pQEniTHb9rhiA
-rA0fIND2liSyXBU+NgKAaFNPpFsR2PqaXh1dV5+yMMc
+-> ssh-ed25519 cKT5Kw krCNPgqeLrULZyGtFdc2VwmEVaKC7uaDabi7tv3dHVw
+OOEZQ4o4xqFs42TEYwNNWkOQbSvVkq8nGA38CIpgx+k
+-> ssh-ed25519 Gr9EaQ /ciOg7Beq8wMwMlVlj+8qUfFkALaGuz4jV2DtG2HLB8
+MU0x/eqLEtUlygWfiBu41bZcPWRWXH40DeLkfTxmgMo
+-> ssh-ed25519 3ENwVg HxpXlptq9Zp6AIRo0+poqbuFTHPRi/f/VGbL8ZO5fm8
+bt6tn4OrjXV+U6eDKuFEU8/dW5MkqOYqVdqkqVfCrG8
 -> ssh-rsa MuWD+w
-g8H4TxApVoRIEIWYKD6vIQKDVZVcIeZ1lQrZvlCDzKvm10Tf/gXHxYzetEjNW7Jj
-xcW7AvClkhFvx30gV2yzGvcbppsILdz63Pi+lZDmmA6mMwEJvNmr2gJ299TZWOWf
-b4Ea9JqIxxm5kSGa7uN3x08M45xqAiSKURfY/snnNOJ1xNn83wgIfaa+8kNoTxsd
-rpkVOwSsoJSkPNSOPp/URvhY/AVG+UN038/ZdHHidPFQwkkUpD80gASwzoxabbKk
-+YHSksOzsMpDqOgluUQ3/ZCHh0/enQjAipy4VOSnsyEsVw7RpO2oNajowPzQw69f
-ev8u4w2VnRVDDdObXe0JnA
--> ssh-ed25519 92bXiA SvFtyigSYI9qzl9Jp2hYe96IBeyDd5ud6CF5KXHA7QQ
-eMDbXYBVdkrUGUzxuQ9Q3Zdt1FmedzPEBJF+pbi4XWw
---- KGAUCPEhq4lX6+8lAMCDnfZL07Fy0anAH1ElHfxREFA
-
-���-�ާ"����n��b}I'ϩ�$������4�A�@��e�P�a@�2��Ȁ���&� �ϧ=
+qyi9QPAHw/dr845IdEOnyw6yu2M0b7nbX3ZCnClemJlmfFx1077RE0CWNEDR7LDt
+0g8241mMIr85MYHDZuVPqH1W7ZTv/DFa39MJBhVCyC0Gl62Gz2ayO9d4flrQsvCv
+NnaVKJPo0uxuvLTUlcX19WWVrt6v23sDMlChleUFdRJy84lMR8ouhtfZV1ipTqXq
+4wZCsXgi1vV0F9oZ37KjV0irGECHNN9ehrrS943357+bJIlZMdVbsYLOXXiI8drr
+mGzOwUFLvD5VRHTWgEZJz15oeanknTjpxrIt1AAJki+esPsKFRkEJ7eL6epXMclb
+5iHW/MpgBXH0j8ARyg6/jw
+-> ssh-ed25519 92bXiA qLAjwconq/2yxJnG91YE9UvpLe69rniXVAwHQYJS52E
+X/W4+1RGYG6qCYGPiUl+yUmwwiNwt+zmhYHQ40d6C4k
+-> ssh-ed25519 Y121Gw J21DUBHP2EpQPpOdUqNZ+deh/3DLjyYgT310v+EZAW8
+a8b8zJgf7DUW03hzGeW8dzvRq+Vl2RbmaG17muHoyDA
+--- hAdUvRfRfdfakQXgM/QMbdpTBj+3vX0d0atqQVS6m4c
+����x��G���+��BK���E ���5m��sM��D{3���,X��9�-gC��k�s����r�:�e���n

build/secrets/hydra-mirror-aws-credentials.age

@@ -1,35 +1,20 @@
 age-encryption.org/v1
--> ssh-ed25519 s9hT2g OuvdELzVyk8Sel5l6fFoE2+CM1S1O3RdNUwpSAqkxn4
-Y32bmIZHe+jiaGvsa+thNQIIEriR2tuQq8NZvrxwDfg
--> ssh-ed25519 UnbSJQ 2CT1k3oo1pSYEd8CFOcoZ5Nwrpwpa1sXS34958HNgjg
-v+EmGVUh3JUYa4udCKls3WXdalBExMthJow5Uld9Vb0
--> ssh-ed25519 Srtq2A zCu7JH2MpuOuuk4YBgfB9NlCl610R2FNFJ27r87Owzw
-czcNNQiOiOKCP4ROLWP+XOIvYNoG/7iyx+5weyxSV48
--> ssh-ed25519 KdJNLg AvGJjg5AlUoQKH9NEvNUbBftXTKw0HPE3SNG51CxS20
-91gGua+pyUvqZ5bY94j0bljeA/9p+XG1oRMmvn4DM0k
--> ssh-ed25519 92bXiA +Me2Jcvw8Ub+R+Gx37LMvKmk4s4eLFlnePGZwQN1q0I
-2+eVvUDpoRTbWk+Vrp7h37KUELh/bR9D4+3eYZyzLE8
--> ssh-rsa ytBgrw
-jeUZGWVC6OIY678lK82dLa4sboJIE/ZcOE0bVOB+HdJP0yWjHEtQgRO99V/PrQ75
-8ZNS8ax+cbL+x7UGw/601WMiOL5jHy4fYLBRODekCsVjzDpsAPurFXMblykapw1c
-QpHOHU49JWBWU/l9QHDuejzEUUY1QQJI0T54JN5ln42se/QeOdvuWJLvK68mDON+
-rk54u6r9NQj+vEAAcvDa9gGAqdGJGNby3oFq3sh/dIsjNQ4U5+kAjeeOpYqQxfvC
-07c+D+K9pXOG5w0rHjAVazBKCRMLeFWF6pzfJyw9bMnEx8D/OIa1EQ1AVLrbzKUB
-dzuCVarVYfTv+0fqXAi9iQ
+-> ssh-ed25519 s9hT2g 3oyWmMcrRcr1Evv9+Srx3z3OyKajSPpJiC3APOYE0RU
+RCC/gmOyy0JRkWIRhzK37xckWnpQYQ74HVAKsRJdL+Y
+-> ssh-ed25519 Gr9EaQ SW4eNlIrULIh+T/IywhzHe8A6wCxoHBSrg9LmC2yOWM
+DbTv2Es+wHfOU6ylHfGi33BnZW9IhtmqawLBax1JPqE
+-> ssh-ed25519 3ENwVg SKaButhSVmBUl8IA+yJk/z+An+/JV9oUQ/lAGEI/VXQ
+6df01m0908K4WtxWoQZTwaETdm0liOz7U+hj4774rBQ
 -> ssh-rsa MuWD+w
-k4zSKHQN1igQ+zL24b88+yjN4/E5+Ie5QQgFoo88UlIfXUeoesgT9e8Ey9O+OwLz
-S4FGa7PM5L2UPaIZRbE3Z1OQ0EeGEJgnIaE8/l9chvDS2/0/hD5L3DT0mNdt5Fnd
-4T72St6dbJjkPpFENjOJm2zynJEsKrPHzGyMtfqSrblEgoUtrKAkMoSAI4EwZv+I
-JyjF2lnHtbvNFHYjHMeCrBnBB6ieLNXSZ5JraCKx2QMJPQxQx6J6zROYteN3LtTR
-mNjU1rMQd49NGfdb8sQTUH/DcB4KjEJjz3RG9AVP1M9egagTY5iTM7vfZxmIqzA+
-xQgkDye3Yyzsif2Bvodu6w
--> ssh-ed25519 K3b7BA b2PWOfkKT+O76tOihG5m2F2UlrOOHKLyv1ijY7ZZCS0
-vHcqfycT4qoq+6bBoISFsxQ/Mw5uXtRPO2KTE6s6D84
--> ssh-ed25519 Gr9EaQ Jv3gTB/55UuLdC6RZhwkYBF14rvvjkibAcvtUXdjGn8
-EiHxq6NJWa4wbq8fMcZZs9hfjiGRx34iHAwIJZvpPhs
--> ssh-ed25519 3ENwVg g4DeKYZkTAwLokwZHKtp+bnKgyQjbZ6fiBNiwnxtoG0
-eG87gaj+ib/LuTew2/5vkE9A2nptOd+taMs4UYrO1To
---- 1ySTx32JKDPJOTIOf/LgJYZXil2TIZNHj20WirRFydY
-�Ռa��ouƹ.})A�����d�	���/���<&R��L�z
-�;�/�tƆ�$���$br�8D��h5���e��n:�M�9E�-H7������@�1���96.��
-�'"����u�w#�nj���jK��¦3��J�KH�<��+�
+Pc51cz+ZOpJ+bakeYitE0Es/gFPjBGMhnACiT7O7shcT7vYSJPNRM8IpTpOxfbf3
+HjzPBNjUihVjGshQ1JFaXbwfmnvF0yIImSlJtWDteyGX2x1yzt+/oA3zjj1KDfku
+qdrhUSRnnobMrSuSaPE4DSnUddXbaMAY/kzzoxzU+nK9FusvJhCgmZ3XYhN+ew79
+aQs+7YXEgTH5J72monWgeYQkj4baTY32xFwqj9qPdx5JjMvtR4cX9xkC7R14EyBd
+HJeCU87uiR3Ibc27COMso1YSp2u/quc7TKmjOHyYfyi7mYZU/JC2ccDsEr/HCE4m
+x00f74TPjV2UY/raslCgYQ
+-> ssh-ed25519 92bXiA 4PM+2XEb8unFUvJXgNqErFmUOToBgF/x5DvCCxWazGM
+xn8PfNfujIkDXtbaH0RVtyzOCPCbDig8hnUOgqfsNGI
+-> ssh-ed25519 Y121Gw faO3WbLjVR26NrVIJfGO5eSrT5DI6fdTYyxPWxD+DDI
+e+WqhJj8EhpXU8nxfB4dDeZZqxvmR/xNfKXj4oT5U7s
+--- CJHN+xb4JfmgPyfZ5QoCGQTo2m6jqIqF4EW88S55Ymg
+��j]}�H�܈v�ix:s�{3r��C�#��qe�aW\�ȘFV��0:h�s�+�t��$�È�s��Pr\Ы�]�6����Q�2Nka���؎M�,�x�N�1��/�;��O�`2��lo�s�ѹ��g&������`��&��

build/secrets/owncast-admin-password.age

@@ -1,18 +1,20 @@
 age-encryption.org/v1
--> ssh-ed25519 s9hT2g zQ6WzOL+1nkg75J8o4SCxzvVZi6gYdSkUSCd+f0oUQk
-dxItcKGnxUUhzuQWUNs3hmJwPaJF8Rhn4FJbom9tc0A
--> ssh-ed25519 Gr9EaQ USWQtUTQsy1B1p4rGOgdfBYg2ch0fDAxHRA7m6gj9ho
-UCA2ExE91+5aMHiRk2OmU4NSPySTzEWtXTpmN/q9RI0
--> ssh-ed25519 3ENwVg 3dpO8ExOR5pr9aIuRjzO7+JEJWCMfDawefoHNcyw0S8
-zF9V5KuZU6hiCtxzYDfrZ1tO6dU3HRZtjQz7ihteBG8
+-> ssh-ed25519 s9hT2g M/D2oe8ocLzBBe0VTEO6UZ0gZb+dL13/rfZ38N1KH1I
+1KmR71+57D0aBRlU7ZvPz6Prg3mNrYc7myq7JRdQQH8
+-> ssh-ed25519 Gr9EaQ iOVXjyLAa/RSGBefsQismPkx53f9OGU1qMzO2rrqhhQ
+8I6aGwAs7AFC/GWW7S+lv7vGyJW8T7Icv1bfHBtNdmE
+-> ssh-ed25519 3ENwVg 5rP46xlqZkRF7u37BxB5PG5utkRHmfpYFxYiCA++xBY
+K0/s0hGBIr88ZHocBrHrEuEUEefAnqH4Fe8dMlCcOHM
 -> ssh-rsa MuWD+w
-ewDKxmREQzA0Ryc1CfXZ3DnctZ3LjdYhFZuEY97nQdywX4yrijjY/KecNpgI3AKy
-yjBdS1cvrlXW5JY40kvwNGnsC2wAL74ccrBBxkPFxbenOTU8xdUBBSXLj3Ad392I
-RvepOJBVg4i6JvBKZXfuDVEKijcmuuaa7QGfnnIawhGOu1crltU+SPW48V2ryH1N
-xG35dle3FoND9jWoxsf6Ftznyn96pqj1t3g5BJYPvofaO8iqkBQr/zbQjimQm10n
-HzIF9S7qf5I8kadvRFPf6nd7nWDCaT0LeSwzc4hA0FzqrfzU0VvM/K/XdO9hFR3N
-K3kxQZg43pae4nt5Eqn1iA
--> ssh-ed25519 92bXiA hggcpARKLg5rZ3zufQO/ArpFFd2eEfMdCBvuvjJSOX8
-seMbAuoEf5X7tjS2rPfQoBS45Vyy2Im8EBn32zDeJz4
---- Y10ci1xFNmo/Hnf+XctF0uDe82ZLV0yPI9n5qcREOpg
-���?/�����Z��m�
 $j;0��wo-�{��K֛�`A�G\v~�0��I�4��'7�D��d
+BeO4rjxRzb54rbpEglPIkhluPp2wRBKxL97Ta4utvUnG44IXRnWt6tuj016qVTXZ
+Z8OzrDVTwusXJZxmOehsgF/rogFAj1Ju+bf9s4fojv1nC8ITnsXLMQjzA0X/VcTA
+DgVWw8+Elrt7sJGiL3C9ws9ATt/suPSdkL+aNhOvJXRwb9NfQUn+XowvJRg1VnzS
+AQx9tTyGVB5GcI4LnxHnyqPj+6ZD/F9XqbHijTMrx60GqRlqeEu9JiUa0YtWnBgX
+FcIrvoRQ6b7G5QDivbqCQ4VuJDrSd7xqKddQVea1KglrQHQdY3KFNUHVlEs1n49z
+Nia8ty+qWIwAEfwyt6c0Tw
+-> ssh-ed25519 92bXiA F7v+xOHVTL3wZ5KUHW+nAyrl93/awx5TXv4izicA0BM
+OD2ivZ1FQ696Wh+odAA4xiJElXEhqsgBok7AJ3ny10Y
+-> ssh-ed25519 Y121Gw YUG5YErjueT2gqqX1x34b6U35uhbdKZWgcTALMXTRXY
+0F9uoegrWXP3lzjRk3eJCtu/OGZO/QqafpVPYitUM2k
+--- M3nGs3hV2JaDDtPyuNeKpyh/OdpZAk/q39OTk8n9m7g
+�J��!�{-�F�F/"T��K��#ׅ��G�G���N|�Z���U� ��D�Q1�d1Ԟş���