Merge pull request #916 from NixOS/titan-migration

Replace haumea with titan

Author: mweinelt

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/haumea/zrepl.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/hydra.nix

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

build/mimas/network.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.nix

@@ -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��'$