diff --git a/hosts/x86_64-linux/zfs-backup.nix b/hosts/x86_64-linux/zfs-backup.nix deleted file mode 100644 index 8f3e7d1..0000000 --- a/hosts/x86_64-linux/zfs-backup.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ ... }: -{ - imports = [ ../../disko/zfs-impermanence-backup.nix ]; - - custom = { - platform = { - impermanence.enable = true; - vm.enable = true; - }; - services = { - zfsBackupServer.enable = true; - nixCacheClient = { - enable = true; - remoteBuilds.exclusive = true; - }; - }; - }; - networking.hostId = "353bc8fd"; - system.stateVersion = "25.05"; -} diff --git a/modules/networking/ssh-keys.nix b/modules/networking/ssh-keys.nix index f55b087..e382b94 100644 --- a/modules/networking/ssh-keys.nix +++ b/modules/networking/ssh-keys.nix @@ -18,7 +18,6 @@ siit-dc = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHCp67Rr03FH0DGhl6d2w/otBNaC5sI1y6rt5Gfi2tP6"; syncthing = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII8s/x8NcdOHPVcTSuVj+X9/J+qbuZEB792YaOG0CUzD"; vaultwarden = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII10aYyPOgpd+WAtgSyomH3sE6Cq54GftVm5xeC8KKlz"; - zfs-backup = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOWGvIc4sq+WzPqT2y003zga3StMgj7F8vwTjNkZ//d8"; }; description = "attrSet of SSH public keys"; }; diff --git a/modules/services/nix-cache-server.nix b/modules/services/nix-cache-server.nix index 1847fe7..1d503e1 100644 --- a/modules/services/nix-cache-server.nix +++ b/modules/services/nix-cache-server.nix @@ -47,7 +47,6 @@ in keys.nextcloud keys.syncthing keys.vaultwarden - keys.zfs-backup ]; }; }; diff --git a/modules/services/zfs-backup-server.nix b/modules/services/zfs-backup-server.nix deleted file mode 100644 index e2ecc43..0000000 --- a/modules/services/zfs-backup-server.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -let - cfg = config.custom.services.zfsBackupServer; -in -{ - options.custom.services.zfsBackupServer.enable = lib.mkOption { - type = lib.types.bool; - default = false; - }; - - config = lib.mkIf cfg.enable { - users.users.root.openssh.authorizedKeys.keys = [ ]; - environment.systemPackages = with pkgs; [ lz4 ]; - }; -} diff --git a/modules/services/zfs-replication.nix b/modules/services/zfs-replication.nix deleted file mode 100644 index 0b130a7..0000000 --- a/modules/services/zfs-replication.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ config, lib, ... }: -let - cfg = config.custom.services.zfsReplication; -in -{ - options.custom.services.zfsReplication.enable = lib.mkOption { - type = lib.types.bool; - default = false; - }; - - config = lib.mkIf cfg.enable { - services.zfs.autoReplication = { - enable = true; - host = "zfs-backup.vsinerva.fi"; - identityFilePath = "/etc/ssh/ssh_host_ed25519_key"; - localFilesystem = "zroot"; - remoteFilesystem = "zroot/backups/${config.networking.hostName}"; - username = "root"; - }; - }; -}