nixos/estuary: Real hardware config

nixos/boxes/colony/vms/default.nix

@@ -58,9 +58,7 @@
               waitOnline = "no-carrier";
               mac = "52:54:00:15:1a:53";
             };
-            drives = mkMerge ([
+            drives = mkMerge ([ ] ++ (optionals (!config.my.build.isDevVM) [
-              installerDisk
-            ] ++ (optionals (!config.my.build.isDevVM) [
               (vmLVM "estuary" "esp")
               (vmLVM "estuary" "nix")
               (vmLVM "estuary" "persist")

nixos/boxes/colony/vms/estuary/default.nix

@@ -10,12 +10,12 @@
         altNames = [ "fw" ];
         domain = lib.my.colony.domain;
         ipv4 = {
-          address = "188.141.14.75";
+          address = "188.141.14.136";
           gateway = null;
           genPTR = false;
         };
         ipv6 = {
-          address = "2a0e:97c0:4d0:bbbf::1";
+          address = "2a0e:97c0:4d0:cccf::1";
           gateway = "fe80::215:17ff:fe4b:494a";
         };
       };
@@ -67,11 +67,11 @@
             systemd.network = {
               links = {
                 "10-wan" = {
-                  matchConfig.MACAddress = "52:54:00:a1:b2:5f";
+                  matchConfig.MACAddress = "d0:50:99:fa:a7:99";
                   linkConfig.Name = "wan";
                 };
                 "10-base" = {
-                  matchConfig.MACAddress = "52:54:00:ab:f1:52";
+                  matchConfig.MACAddress = "52:54:00:15:1a:53";
                   linkConfig.Name = "base";
                 };
               };
@@ -136,7 +136,7 @@
 
             my = {
               #deploy.generate.system.mode = "boot";
-              secrets.key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPhxM5mnguExkcLue47QKk1vA72OoPc3HOqqoHqHHfa1";
+              secrets.key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF9up7pXu6M/OWCKufTOfSiGcxMUk4VqUe7fLuatNFFA";
               server.enable = true;
 
               firewall = {

nixos/boxes/colony/vms/estuary/dns.nix

@@ -7,7 +7,7 @@ let
   ptrDots = 2;
   reverseZone = "100.10.in-addr.arpa";
   ptrDots6 = 17;
-  reverseZone6 = "b.b.b.0.d.4.0.0.c.7.9.e.0.a.2.ip6.arpa";
+  reverseZone6 = "c.c.c.0.d.4.0.0.c.7.9.e.0.a.2.ip6.arpa";
 
   authZones = attrNames config.my.pdns.auth.bind.zones;
 in

secrets/colony-netdata-powerdns_recursor.conf.age

@@ -1,10 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 B9K/XQ tDBPRX7DnmpYqxz4gXvV9LZ8tmRZPTAG6oxETGbd0UU
+-> ssh-ed25519 n8CpUw 3na3rX1PrjMPa+ynr7g7aOKZOb9JRpJ6fmRgzCjFeFQ
-48tfItNKKxWTSfgDlDo/k6plBRYiiXMASuCLGxvoC8g
+tC1fam8M781xVPg5/8glb+sOnH/zeEZz8v7pHwq3TU4
--> X25519 STPfXnE2jyweZvx57JxnwGLqLRhc96UBv0PU5JhwBC0
+-> X25519 HW7WdM1+TxtRPOU50vljY7UfFsGAaH+/ZM+6GVbXdSU
-tWvrDl92aYEOOMluQBHo3qjTyLnJpNbteFEr5qbLvBc
+3116WCf9LqNYhy3ExbXjScd26niTWf4MT8jG4B6C4oM
--> @8-grease 5aX
+-> E+-grease =~i'-n |
-BQEHOARPN768tA1QK18wGhrK/vWGLFZvgxq4IQYs9KwW+Eudlyp/Mwt9xz/eizx+
+goTQr7NR7wU
-p4HMKg
+--- byZX/NO1psubXPAEA06kupcMBeml46RzGGQ0JuZzuL8
---- r8SG3CERXL+gYc0b2dHvRUPf3JrW3jYL4d03pFcBR8o
+n˛¸üź^pŘz×DĄÚĄ-
-»ä“<ëÚÐÆBPv„•È¯<¦exz¨0õñïâf.è<?Y›ç낯<E2809A>÷·ÖJ4ä½ijß9i<39>¯ž$Ý,Oô·‚<08>ª¹áܶ›Ð#]'~p£ÌòôÖ<C3B4>ƒÿs‹&t£{Í2œXl%¤È6L`a‹·ñ¯Žãütrd!æ)F|&‚ÓžI#ÙAOþzsA T@X›
+hÝ ď…F)ä0ťŰ!„Ą)¬<>ö\ëp… /	áŕÂh+GôbčLĺÉPüą<C3BC>áaşšÝ
“Ď’Cdˇ‡†¦‰Qôqd~Đ°łgÍđůČ	:ˇ=mrTľűY¦ž6LHy¸Tć©Ei’mFź7‚B!h¶’đž92ĂčĄč‡Pő S1R

secrets/colony-pdns-recursor.conf.age

@@ -1,10 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 B9K/XQ pDr63Mxy93vvgTOOeGx+P2olj58AszuoW4DMU/2vwTs
+-> ssh-ed25519 n8CpUw QjNXGWOUJ1wyKSN6WBUcUg1Iheb6SvTJAjhESBUPuB8
-q0BfZmSo7PTHbbwX+8BdbJNiOjHflEsRVRyb96CCfJs
+BcmPlu+eqCqZyO5hDHvR8I3jVvzocbD3imvZ7Fhl+So
--> X25519 wclqj46DLlI26z5xVt2FdTzYI5QUrZAu74y3Hgm1j18
+-> X25519 w5eqTb2dmE0H3yx03k9PzDYgvBMi35BMtNjGKULdPms
-WpK4K+hsmxjVKGbt/NuC/Khcw1mSH121AabF0fsYLVw
+mZEPfazZEMBoh4IuMWHxJcu7W5Hz2+pPYraLVtUd0YA
--> t]-grease fmXI7F 0vP#;w *
+-> vP0AU-grease 7 "p/b 2: ]dK!%{]b
-mlRT87J7NtBKsK1lsNBArc9Ofo92Yniki5o3deA
+P5/KbvcwfGfG84Cn7CT07ct7lGLF/g5oNV88wGZ6UipK0g0G2Xdn0k3t/gHzZpHc
---- k5dfRl70t63RfTENRTTgBzgi3lm0D26KFkj73tyHMBo
+3yVJGso5/r6G9FgG
-¤j<EFBFBD>÷»–MÞšy¡-š?h3kÔWÒîŽåßèv{M~PÁô[aCÚCj(øŽÙ¦e¾l¿R–PJ­ø%V&»è<C2BB>å[†ê
+--- GIjjyxKeVCAYPMT4yyMo13OVnLzL+eEF77qTVVTRJbo
-62Ô£.Ä
+><3E>•a´«Ð<C2AB>ùo·Q{nXáÌä×E<C397>ßÔ{GS´ÖwÏïhÍ–çøÆrz§;ô<>¿‚oñåçOQ\²9Öœfˆþy¹äI…’å,ÏhÊ

secrets/jackflix-wg-privkey.txt.age

@@ -1,9 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 vf+WVg +Ftq3XX892mQ+cB1nPRq6eDP7HPdFogZk/EbIsuxuk0
+-> ssh-ed25519 vf+WVg qXtAg2GwqpwDkSEYBFJJj+SRoGSV9iyoHnHkfNSFu2A
-i1ihGVigQBA7pquuXO3sBABSXN9x8IIJ64sfiNQ201w
+TqVkf9qrC61dm015+9B81UM2duJkkn08pCsb+P4DnCM
--> X25519 YB51ze5czSe08S89gtTWQ6zuxoMJZi5+23S2GXCXT1M
+-> X25519 3QEcbcJq2fkjfVxvOthjQLdI9oQe4bqnqStT9XGJfG8
-jlLwxefYiijkj4JH4J+sUVJxhBWYfmbGjwi3B57vphU
+v3dkB8GmZM0edYhyfSd+NPgjTH6nVYcdPs7o0xibkvg
--> f3mY-grease w kU}uSw m_ySQ R+
+-> -(?m|[-grease S#{ aJ3x*'s
-t7aJI+DNE57a0chgz08QlOIPpZyudJ4EjGChyO0ct9rQkrT87AQ
+PEzYDSgCJRy2hjOBmlDCLVbqawYhwFIcWklyJd2y7mNS1KvJX7ouOSzxSYYYC78+
---- vugV8UZzBLfeLBlFPBfiLAo1aaU28p1JLNyyGQkztNs
+MaurcPYbKe8zqZdgAF+/e9mKf3gUBekqYltVEQveeQ
-W4¤–)¿5-f5cД×â<1C>—S¯³ù8ßQ]3±6è~)JÅjͯ”ÝW{ƒ<>ÖK“!•Ï°!HÈ3—(Ú ü=«>Šw±Ÿ|
+--- 5p482W+FJKbbv6YQ0Jtuy5bw75RG5zJkhG9YRzHcJY4
+wÿI–æ|f
‰l<11>B¯ÄçϼJÚŠ±A9¾¦s³¹©
+¦Ç\i“€¡_™R ¢%x‚BÀþw?'~ T£%ÙrÂI½b³¯A@K™

secrets/pdns.conf.age

@@ -1,10 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 B9K/XQ RPTsuo5LXtXQ0yRf4lix7nOn48nJawJo/fv3mYZJfCs
+-> ssh-ed25519 n8CpUw L36ivajrz0JmCTvTvANtuYqzSbSL9BCw7qZ9jZV/6xA
-FTIAc4/v/TQipi5I4KaOX0GDksh8TzjC7eSAl0tIOBk
+k4t4IWXKe33I71A7zJD4YCP4GJr6QIokc7+9p36g1WY
--> X25519 pWMx1kfOtpKjB2v0nxlxsxMAgNTUcHlwd/P4+1KxJh4
+-> X25519 JpwKfbsKt6Esh0+GAXfAHF293Qhts8vGSoODUSPOAxE
-hgBRp0O9u9g+E27L+gFwNQQO8U9CTpO4wimbSrw5xGA
+z+0/8vcGBYoslXb5EzsImpAiagaO32MVYw70efYBQ5o
--> E4fsjus0-grease ?9*Pp +%i8{y
+-> Y2-grease *"('T
-2RUCSOqmenVa1VlGqIXGuFcs8tbJavzHAqkIeMKVRGhE8akkRwAluTvXMMSD4fXJ
+5j4ocAbDAHv+Mn7CorFoRqK87I4omu6W3eiGhFl0pF2XBJgnCS2i0+8qFd57T0oW
-MqXGrxz2CpkwsUgq1nV80GHpQP6a
+Cjee9LbI8sDFFRO9lQ
---- TXdOf7GTxBUBkH3NnM+BnXif8xbGDf4xxPgHX/oTyhk
+--- /6tyKKu52i/cK1yKf/z1emPDjkP8WbDJUB/mRThBLwI
-<EFBFBD>Eƾ¿ZÏGT<EFBFBD>%}^hŒÅ!.5Ø®¹5u­ëxxHRÆÕÈ‚Vì…<C3AC>bc‰úu£ï¾3P𣜫ŸÂkcìì$N‰I°áŽÎ$m2ûÿ
+Â\T‚˜B,u6n.!"ô7R’›8Ë›ÀªVª¬p÷»à³vöb´ã0q(,A×#tŠåçè£or”™\M׳øÄÔ}­â'»,üY®

secrets/user-passwd.txt.age

@@ -1,23 +1,24 @@
 age-encryption.org/v1
--> ssh-ed25519 FAIX7A pl4zTRrmyNifdO8b8doSjet5gSoFpONfiguMwVpOHCU
+-> ssh-ed25519 FAIX7A eliaROKgZJ5pHG9fafJBWkgNyXxEf+mLM4ZDcWxVMjk
-7Xh//uKMTAommAVmmr4umaKT+sc1UMpyN0x5nktXd74
+xqakzMg39A4h/30x0I/kguAXJFAdWGXNIFF6XwN8YMI
--> ssh-ed25519 j67FXQ wpxRi34I+bFkP+bkOPsBRpoZXem7EBU0qEEoI7reiFw
+-> ssh-ed25519 j67FXQ vv7q5hrYCpfzEpuV6WqPOcfSJi0ch5iPZoZ/3A+SUCo
-8q54R8NNM4pOybQdijpKgukvzNSKgkHMkmyvkC40aCU
+nn0gmKtxO2yygDZ06gjm/3BAmCk2J8JJaqRG3t9BJJA
--> ssh-ed25519 wbGjmA 9W9Zd6IiHTAyDmtdFHICgHNBNmSv69dWIQ5PWrBmbFc
+-> ssh-ed25519 wbGjmA mJLB7ynPlwIepLmbrM50PYqwnfw3YL/raqd779A7N3A
-ypSUUmdRztDAFFMHr9KHPPZhtk9wT+nOI6fU3f/r95A
+CwAY4PSGRnf7iwqFOO72BhFOO3pSWOD/iJ2Eiyaskwc
--> ssh-ed25519 B9K/XQ z9MyCdvCDmEpoQ6VAc4UL5ykKT2y7dTWkd8uC0TCqWY
+-> ssh-ed25519 n8CpUw OHaSXGdBorYjO5CLVtOrBtiToY1hOuWegEHAw+b2e2U
-dI48qpfve02o34ThBSuXpR+k/ZS0JdcWWS0lHZEy5Xk
+oQp7feEmm1JndrKfOhdCCyPPAwnkiwdR023MurH4dhM
--> ssh-ed25519 vf+WVg Is1UbqPX+Wg/Z+ofr6pltx1Hd/YU7r0Cw43vYN7U834
+-> ssh-ed25519 vf+WVg 7O5icW5o6qmTsYpIru7zsa1YGfNHLWMD0AbFTYw/nTY
-BpsNPysnx0kDPvZNx5kiHBqowGxc/ixcxLbVrEEVNEQ
+BWMWEhQZuwfNGhyDecA6Ehod2LXXe0mej+f1Qf5i68M
--> ssh-ed25519 H162lQ fLD0bnsOAT8YAwRwScQmDY74CCiKz5o502ENBs3HyCk
+-> ssh-ed25519 H162lQ OYKOF0kAjSIhUNxF1QnurWtNx2LUef5Flc9Ts7MT9U0
-4BOHx7fsMEIrKUt1wQ/wZwthMQMtJLcLRt5zrNY7pOI
+/CD5y/mk7tlwwqWISSRZM4zJ86KXpKw0pR3Yl5PwLb8
--> ssh-ed25519 b6YMqg 87GJmhVV49B3lI74QT4GszBMWIoADwZ6Tr+gn7ai9gk
+-> ssh-ed25519 b6YMqg nyXEuYq2mZR7CdPf9WgzjWbMA6LeGrnucZP8P/W6v1k
-oHvVeEduJ0WBl0WmXAKgn6qmC8GRZ3uKQHwaEehKemI
+a1PRL1amj5EUnKy3ntts+mj35KY3SnzdhWKDv0Uw674
--> ssh-ed25519 Lqn0Yw 14WT2Odd9MqCJRmFnXYMT+78J5tPAoE3ZN50eY8o3wY
+-> ssh-ed25519 Lqn0Yw VyPYS4Ji7eOZ/ZnvduesWpNZvSuZWhgTqZxxdhyKMjo
-4RZjgE0MG7DkGBa7msq4cq3sSBQp+AMzghAvMWpEpds
+KOZQlpkU8AIPwZjlqqn58QrjfoLjayHaRl8aXObfqI0
--> X25519 UWwTiaziKhTE4iW3IPYg3eVtgRp+bnyWxrcW3k66VmA
+-> X25519 0Qx/KFWFSNOdNgyiPa/0a730raEejHUtbppVMsJIyXY
-Qb0Sj+t22AqS0lgx7uaiDgOn7KMxnDvUKRczTQB9TG0
+gv1WtZRySVbBdQPbm/i62FsoC5vDkuXRHDPp3WttIBY
--> N6|5#-grease
+-> r?z-?\-grease x9 ]QgMK 7wyy .W7
-
+CFhO2JPqygpgbbIeV7uQ7TGyUb7tjg
---- SBETWPCFXoHLlWtd8R+ZSoFVqaE1RThAP1QwkU+f9a4
+--- RR/yBQldrLPK68Ou1rSEoRyuyxaRQg0FTYVS7ZAkU3c
-™þ£d˜âÐý++ÍéÄxNÅñõùÓa"^¢w ä.—Ì•”#ìÅõ‹¾4=ØñÒ³ï×<l3.ÄŸŠ‡¾ot"<22>Ñ椿Ùò¬sc Ul6=¼6ðÙv9‰<39>3<EFBFBD>Ì»¢[ônÔÔû¿…M­9)Àk2YÂÜ1ܸg<>i¯>NÐ-J†=ÿ¸²àžÖé-
+[0
ÄöØLŽ‡àÖÚÅÁ¹°GOhÄ«Þ~£>|GÕ)+A*f"íÙ2jráÖx‹×ÆÛ±Ž€å/Ì-ß0€ÛÂjnWû³Ë±ÔõqÞ)¢òÀ”.}üz÷Bî
+5ba;wÌÚfâ$Xónw‚×”,‹n§S3<53>»$áMÿ9.ñj¶kJ)*ªLER+j­­

secrets/vaultwarden.env.age

@@ -1,9 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 Lqn0Yw 6M1t8mb0iZdJSPiz8Nu0nRywlpArnvcxizdxr6u6yGM
+-> ssh-ed25519 Lqn0Yw Bz5NlkaQ6pP+6yDPYrPQ6cGUe5E9KX6YOaPD3W8RDUE
-w1PzOCZszgyc8vF5GJPI5l8RtQwFv0CNhpAxJAF6TOw
+DuqoiMGa0qLYLkoMc2w/VG7LK/lFkWfSIU0PXnvbDsY
--> X25519 +M017bsZwXazaojl9szfKRagMK1lzc+gpbaqKNhRuFU
+-> X25519 wQBPBsriO5+gtVhEv2eUFl23Zlrb6Hsmoc1gcpz52UY
-fx3Y7OykdZXK1g9ixdhExhAmLqoVrWlNUqvkMPYtc0Q
+m/vtia8Br7YcDF4b2BDNu7XTi6l0ZUWnFc1sUb1fKbM
--> Lv3@gmCc-grease v5T@.
+-> y-grease N [Q!. =p+sf|U# Q
-BUBGyMXy
+MZ67rBOVn7P6axlbaHr2nhWwJG+9xa+TCs437ZPno9eADiyD0nM+rCbieuCuTQ
---- PoRgQ9bY+fxY2gJXHUQbEGW/bqa7KwonajSG+ccr6Mo
+--- RdezvRzpHycG0lYi+I26OCNfk4NrQJ4nw+8m9prvPLA
-ŰŘ	IóëR‡0Ç?>A؆l<E280A0>óÁŢ.Ť‰E¤ˇ˙Ę$ĚĺŔCĘß^â!fËg‘Űۆ3¸Ęd;i;–y[‚ů<E2809A>;j‘ÝŻľâĚ0ŃýWlĄľ:ţÜq—›
<03>Ýs<C39D>ťëFiÉśMăüt-1+Ýq
+v¼6‚°«}n2üE£|ño³½h§r
+v<EFBFBD>Äò¹¿UˆI#çW<>Ž
qñA<C3B1>ÙÛ\ùô¸Ë¯Ú3¯ý·d†•ZÍE…i­MdqgÓX•aj” Ëžu²C>‰@ùÁsâz½ðx’._