diff --git a/nixosModules/drives/default.nix b/nixosModules/drives/default.nix index 81596e2..ea8a0fe 100644 --- a/nixosModules/drives/default.nix +++ b/nixosModules/drives/default.nix @@ -9,6 +9,11 @@ in { options.kropcloud.drives = { hasSecondDrive = lib.mkEnableOption "Whence this VM has second drive"; + secondDriveMountpoint = lib.mkOption { + type = lib.types.str; + default = "/mnt/nas"; + description = "The mountpoint for the second drive"; + }; }; config = { disko.devices = { diff --git a/nixosModules/services/default.nix b/nixosModules/services/default.nix index 5a9d92d..b21ac59 100644 --- a/nixosModules/services/default.nix +++ b/nixosModules/services/default.nix @@ -5,5 +5,6 @@ ./tailscale ./hydra ./k3s + ./nfs ]; } diff --git a/secrets/k3stoken.age b/secrets/k3stoken.age index b70022c..7e6ea46 100644 Binary files a/secrets/k3stoken.age and b/secrets/k3stoken.age differ diff --git a/secrets/keys.json b/secrets/keys.json index 02ec765..7bfcb3f 100644 --- a/secrets/keys.json +++ b/secrets/keys.json @@ -7,7 +7,8 @@ "test-server": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID4ioqiTzYe6Y6H0YfFkWyDBbCB25wYs3gKNZIufE/Sn", "node0": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIITESdAzft5+WqMWM2A9Tix8BDWGnVv3z0IF8mqXwWA0", "node1": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMxhznyKJwumO3jzm9kjH+lZJln7fypT8YKAdLNhVspU", - "node2": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOkaqX7Omdrfa4Ot3J+k6EBUkPWp/frEYIFzS1OLc3tw" + "node2": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOkaqX7Omdrfa4Ot3J+k6EBUkPWp/frEYIFzS1OLc3tw", + "node-nfs": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKv1xIg3+faoigxh6S9hUJMIPe2KP6Qb3PQtvFynkrtI" }, "secrets": { "mypassword.age": [ @@ -16,14 +17,17 @@ "servers:test-server", "servers:node0", "servers:node1", - "servers:node2" + "servers:node2", + "servers:node-nfs", + "servers:node-nfs" ], "k3stoken.age": [ "hosts:wenar-nix", "hosts:lenar", "servers:node0", "servers:node1", - "servers:node2" + "servers:node2", + "servers:node-nfs" ] } } \ No newline at end of file diff --git a/secrets/mypassword.age b/secrets/mypassword.age index 1961265..b48472d 100644 Binary files a/secrets/mypassword.age and b/secrets/mypassword.age differ