Move heptifili to a new host

peterablehmann · Sep 15, 2024 · b4f8f24 · b4f8f24
1 parent efc14dd
commit b4f8f24
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 119 deletions.
diff --git a/.sops.yaml b/.sops.yaml
@@ -2,7 +2,7 @@ keys:
   - &peter age1d085lpynkxxf0mfus0rd3qq0r38clwz9d5ddrl79x982z00j6qsqq8f54g
   - &system_mns age1s7xs405mkw2gagclktekz27lxhh38se7adrkdfc0x2l28j9xsvdqcdrsyr
   - &system_ymir age183wgf8xp46chqk049ekyg7vsan2p50zh4lqfllcllzwuekeywdzqn7pz0q
-  - &system_heptifili age1mh0j4zza7w97v9eguuy7szpqk5hp03ea348ev6ylqkes73pml99quekxf6
+  - &system_heptifili age1nany90gu4anl7vez3nw7fy0y32vrnp4075dqnc4j9797p44765vsuqzfl5
   - &system_erik age1t0jhu8e23xn6qmye9ghrt0m49l86a8u08wwe0cjulkvytj5gqgdqhh8wtm
 
 creation_rules:

diff --git a/nodes/heptifili/default.nix b/nodes/heptifili/default.nix
@@ -5,8 +5,6 @@
   imports = [
     inputs.self.nixosModules.syncthing
     inputs.self.nixosModules.restic-server
-    ./modules/zfs.nix
-    ./modules/zfs-exporter.nix
     ./disko.nix
     ./dyndns.nix
     ./hardware-configuration.nix

diff --git a/nodes/heptifili/disko.nix b/nodes/heptifili/disko.nix
@@ -1,8 +1,11 @@
+{ config
+, ...
+}:
 {
   disko.devices = {
     disk = {
-      sda = {
-        device = "/dev/sda";
+      root = {
+        device = "/dev/vdb";
         type = "disk";
         content = {
           type = "gpt";
@@ -29,6 +32,42 @@
           };
         };
       };
+      restic = {
+        device = "/dev/vda";
+        type = "disk";
+        content = {
+          type = "gpt";
+          partitions = {
+            data = {
+              label = "RESTIC";
+              size = "100%";
+              content = {
+                type = "filesystem";
+                format = "ext4";
+                mountpoint = config.services.restic.server.dataDir;
+              };
+            };
+          };
+        };
+      };
+      syncthing = {
+        device = "/dev/vdc";
+        type = "disk";
+        content = {
+          type = "gpt";
+          partitions = {
+            data = {
+              label = "SYNCTHING";
+              size = "100%";
+              content = {
+                type = "filesystem";
+                format = "ext4";
+                mountpoint = config.services.syncthing.dataDir;
+              };
+            };
+          };
+        };
+      };
     };
   };
 }
diff --git a/nodes/heptifili/modules/zfs-exporter.nix b/nodes/heptifili/modules/zfs-exporter.nix
diff --git a/nodes/heptifili/modules/zfs.nix b/nodes/heptifili/modules/zfs.nix
diff --git a/secrets/common.yaml b/secrets/common.yaml
@@ -20,47 +20,47 @@ sops:
         - recipient: age1d085lpynkxxf0mfus0rd3qq0r38clwz9d5ddrl79x982z00j6qsqq8f54g
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMSXRiZElOblRHR1VZb2t5
-            Um1melNkaHR6SjFGT3RybittaWQ1QUd4c1VRCk94MHpRU1RXMUoyWDJzUzFZNnZC
-            alEySEMxaSthc0x5ckZxbmh0cG10YkUKLS0tIDNGcVVjVVBZWU8zR0NDTlFHa1Vt
-            MFpKZVV1TjlzcG5Xa3JFbEZTNnVBb0EKBcI3BMDflc8Zca6m+FphvB2mPp4FkLB0
-            FwS1EWwzSXROimwW95MlpZf9yoRkgJ8yrK5IRXihBxjhbiyJEGBnaA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaQ2RidjZpMTB1aTF2T2c3
+            WTc4R05hWTVTYzlhV0NFV0FteElVdmxYc1hJCnQzVEtacFhWQWdBSmJKbXgvRStD
+            UVRUMlpGZHdCa3pXd0Fpc2xpeVNHTlEKLS0tIDRIU2l4eW02WGs5bVJZd1B2ZWdI
+            UHdiZDhKQzVaWFQ2WCtyQW00SXNWZlkKEU2+goWPIxglRWmQnZokO9b01f9PAEPu
+            0LrXF2VuDoOccnLAewldSj3erhVtgasay80mN4TVrxtdsM8M020cqQ==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1s7xs405mkw2gagclktekz27lxhh38se7adrkdfc0x2l28j9xsvdqcdrsyr
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHVmtTdFV6NElzV0tQQkx6
-            Mis5UnpPS2p3OUpxUDJnMDBiTWRTb3I1NndNClZVRkF0ZUc0VyttMDdIampncDJC
-            QVpyOTFENGdzamYzN2NBUTcvWWVUZ00KLS0tIE1jNkc4QnVObkhoL010VEgrZmNZ
-            VjVIY0NKMmZtZkZ1bklRMDl3cThqQUEKDEmq7Ehc0XGBYXp9WfJNTeL01yzdAKxr
-            ki1l/IA9fG6vzq32X9244vRxoybX6Gof3okrO7DM21jv8W9EKT8xZA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLNUxiUHVkY1NWUy9MMi9y
+            dHpmZU9pbGRISFh3Vm5UUUF3WEg4U3c3RmkwCmdJVURzTmI0aEl0UGJFUWJ6NjFP
+            Tk1rbm4xaVVRMy9WTjkyNFlHSHJkaVUKLS0tIE1sNFhVNGU0SmZNVFAwbFV1aE56
+            RElnVUhVSkZCREhBTndvaGh4VGo1dncKeS2SpHyDWWSlucRnDgbxUL6hhhd31f9S
+            SWulq7brGj82YZMdyBJ+iqMruJz/1Z0yF3ahTHlG0Bk2Gumy76WKpg==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age183wgf8xp46chqk049ekyg7vsan2p50zh4lqfllcllzwuekeywdzqn7pz0q
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnT2NXd25TQ3YyWUxzMlR6
-            alRiejRpU3FjdzNXMGl4Z1RhQmhJaElsSFJVCndYNmJsNFNJb2sxV0RCR0JaemRx
-            UUtweXp1WDV2L0tDUDRVUVVFT3BOK2cKLS0tIHBjb1E3c3hYNDJRbXgvYVJFNlVv
-            bTh2Y2h0TThwYlRLemNuQ3VrTDEvUGMKrH/eActR/qGWOCqRrFtNH4yQtf5VC7d1
-            nTkpaQplKM6WUk1iledKxs470mhkBYK+yg5KCWvpW8GTVIo9b3WygA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4d256bzdDK1Vja1JkWE5C
+            ZzAzTHUxd3NVeEJ4MlZFT3FTQlg1WEc2ZVRzCnVsOGpxdFZwNitJT3pVeXRlVVkr
+            UDhwdTJHcUZ1d1Fxc0k5RHJyWDh0NXMKLS0tIGtWRE9xTDVkdi96bXFrNklvOVl5
+            QjIxeXB0UVc3bUdJNDlITHA1c29zZTQKrK6o4RKok6XKFUJ+omnbDy1If7ziS1hu
+            65SiHr9wm30T3qXEt/nT7NjehGEyjHReQi01Afc5iy7m3mIgDFeqhQ==
             -----END AGE ENCRYPTED FILE-----
-        - recipient: age1mh0j4zza7w97v9eguuy7szpqk5hp03ea348ev6ylqkes73pml99quekxf6
+        - recipient: age1nany90gu4anl7vez3nw7fy0y32vrnp4075dqnc4j9797p44765vsuqzfl5
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYUGtZbGZwaG1NWnZ6aVJI
-            QmJVNkovbysvSFZnMDE5T21vcDhESkw3NlhVCjdjYVJmRU92cE15Y3VwaTVtU1N4
-            OXQ5V3VhN0FiVXBpU1FWMVpaMUxDSlkKLS0tIEZ0QVRRRWMwR0Nyamx6ZFR0aHpr
-            c25VN1Z1UVArQU1FZ0hMb1BsRGdtZEkKkJZH2/fwuVYMsSMtt+AqrKcHY5FWsN6N
-            uHfb6rNJPNpNaofGyXSJcpn+Ks8r663TuDyc447f8cRoB+YfOhdCww==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkM3hpL3ZIT1B3ZzBCRzU4
+            WVBrcCtjN2pBMWhSdll6ZHpSa016U1NKNEZzCkpSWjg0UEJsNEVFL2pncFJoSmVr
+            Y3ptTUM3d1R2VjBxeUNyOEltNW1zQ3cKLS0tIEZXczlQVlhkSTVLNklHYmRTVllt
+            b0FsNnJyYkM4QzlVU1k0Y2tjSzJhVm8KXi8bA9s6YaghiVjq8H5mabCWRfaD1vuy
+            xmtrjF9K+dQAGr5Cx00Q94k0TevDXpeMsQymQ7Ce4UtgzRBhlNtuLQ==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1t0jhu8e23xn6qmye9ghrt0m49l86a8u08wwe0cjulkvytj5gqgdqhh8wtm
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBySlk5YXlVKzI0bzFhTU5u
-            a0lkdGxIQlViaGFpdXhGL1htRWprcVRYemljCmVheTB5bVN5Ym5FWGd2T2V0ZVkw
-            eHllTHhCMGdjOEg0b1N1Yk03Sm5UdncKLS0tIHg2V0IwMFBWYmxVcG4yczc3OU1w
-            S0JnY21CeVBYSWpzcXV4MGNFc0p4RUkKcout0OIPfpPgUVIXvHYcBA/pb1XkCdq9
-            nz/uAMm5JkeYNkDSMrw8yli1Lytc2qUzduMo+afpd4V6IZ8dOavZUQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqbzJrUVJDWi9XWnY5YjZG
+            Ym9WUHJvcnZmVGxqSnNTdjMzcmQwMmlxSlJJCjN0aXRYRURGT0EyQnM0TklQK2xG
+            M0RkT2JDcFlTbG80MytpMnRoNDZJeDgKLS0tIFJnekJBT2k0SlhPQnZFWS8wSTdN
+            OHdnRzJqMm9HWWh3UUZIOFBQalBybWcKCWnoO74KMC5/hjIR6jH/X5F+qYludOgn
+            ug6lqEuTEIyedk+MKtBqa4geGs6RTAl0vaSRc6yVyOHsB86rrVChbQ==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2024-09-11T18:09:25Z"
     mac: ENC[AES256_GCM,data:hYmEoaU9wNKD89GQW3qDo1CbIrmkymVNBBfLJpW9ILMjfz93+jOelvuPf53sedlh+CYRDvK9q2aH2i3R44iPJr+Dmrxho4qnkMU6oY7ABeA7elyzuXvGqQu7UykYS5IvdlCIJSHhi/kv7zDbnXhrzjbooPtntkTOc9SMNBcb/tg=,iv:yd+RMKEOqWxDaxHBGIo3s9SWSXs0Xcy5YOBRRF1pB8M=,tag:w9fZmhLtAmjxlShvuvcyPQ==,type:str]

diff --git a/secrets/heptifili.yaml b/secrets/heptifili.yaml
@@ -9,20 +9,20 @@ sops:
         - recipient: age1d085lpynkxxf0mfus0rd3qq0r38clwz9d5ddrl79x982z00j6qsqq8f54g
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmR1JjT014V3BRNnFxT3da
-            MDhxam5iUWdyZ1ZmSDVXTWNxSndPYWs3V0cwClo5VGUxQ0VONGhJQi9pTEdCMlIw
-            ekg2WEpiYTBtUEozR04xaHJ5Zk90Z00KLS0tIDgxa0w5UVVwQ0FkN1lTWEhZRGtw
-            ckE5YitXRndMcTJTRXVFb05mbEhHZXcKlcxs1gHNnj0FZvdQlJDbKCWC0r59hqMb
-            K9zHpOyXypCwWiCOhrpKpAK8z525tnxb62Sb+pZBInOj3KRPTY5kVw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBha1c3aEphT1B6enlTRlcr
+            L3FDbzBoSzFVSmFPMUp4V1lONlg2bUY1RHhjCkQvVUs1UHNZczllNzg0RFQ4WERt
+            VEdHZ3V5dThDaUQ1ZU5xTFhzOXZHVncKLS0tIENYTVpkODh5dHR3SnI2L0x1Vitw
+            cFJyeFRtbkk0aWhmdUkxajRwTG16Z28K0+U6zYNtlPXsMoeio9EBe0PmOIF9vOyG
+            Hjja79ocNguEnWnbr2xDbVhXS515SZH2c2CWyr+RCUwMF6AaSJR+sA==
             -----END AGE ENCRYPTED FILE-----
-        - recipient: age1zw4a4jzjdz8vw3u3uxu04lc4c400xsx2d3auvs9cefs9ukutmdkq7lre7a
+        - recipient: age1nany90gu4anl7vez3nw7fy0y32vrnp4075dqnc4j9797p44765vsuqzfl5
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzOGt4cUR1VzNYcXI5QUcy
-            Z0xGSDVyZEZNQ0x1TDQwODlVN3VnNEFCRlFNCkpPU001UUNMWFlRRFZETm5tZ0ow
-            QmoyaUQ0K2pSaUdWZnAxUWdEalN3cEEKLS0tIHBIc3dkTVNvbGtBTTV0dG1BU1E5
-            TzNSVVFKUzZmU1FsYXVPTWtObkcxdTAKjanGteYgqaY98ks1vVtZ2cIN/c9qdmOV
-            47RdFgVqQA65RC4KBOJNMRgZfWR07mq/cSt/DXnrV87JyR7T6EvuPQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4OTBVamJNUWpIUDFweS9Y
+            cElhSm9oUkVBaVhLYTJSVEhGTHROWldvQmpRClFqYjNZNjcxOUlWOVU0S3hMMzFL
+            dCt5TXRFSHduQUE5N2ZsS2RFT0Jlcm8KLS0tIHhtYS94NC9zRktuM2VEVzZCRU5j
+            OXhReUs2dzluaHJhdG9ZU004SmRnSnMKT/DUckr3yWR5HA3O0Wh/bFVuKz1NmXFw
+            Yud8aO1F6H6GLbWtcU0u1NYtjdvtroiC+17uL6uA2MZVRPxaupqoMA==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2024-08-02T14:56:31Z"
     mac: ENC[AES256_GCM,data:5i/xF1VNL6fAkQqI8Aznwrd8VNQi5ithfhTuzsH6RQqw/bP4aeLm2Th5lR5902MfDVYfUzQyzy07wUbMrBGPutEvxU/URcyPBFcrDbl+qH2Ej2i2flWGc0ATnK1oueHg7yHxe8BmFyIzY/EIkILbQcQqHU+/sL7NT20a/yIO5U8=,iv:wgzC60Z7PIlbl9t57W8bmWH+ZVx04RMUGBi8xOrzGns=,tag:yGaLFNuxoMVrMTMK4wxuNw==,type:str]