diff --git a/hosts/elucredassa/default.nix b/hosts/elucredassa/default.nix index f80ffa6..147af4d 100644 --- a/hosts/elucredassa/default.nix +++ b/hosts/elucredassa/default.nix @@ -25,11 +25,11 @@ in # TODO: modularise this randomcat.services.zfs.datasets = { - "rpool_elucredassa/backups" = { + "rpool_elucredassa/backup" = { mountpoint = "none"; }; + "rpool_elucredassa/backup/orm" = { mountpoint = "none"; zfsPermissions.users.syncoid = [ "mount" "create" "receive" "recordsize" ]; }; - "rpool_elucredassa/backups/rpool_orm" = { mountpoint = "none"; }; }; services.syncoid = { enable = true; @@ -38,10 +38,9 @@ in commands = { "testing1" = { source = "backup@10.127.1.2:rpool_orm/state"; - target = "rpool_elucredassa/backups/rpool_orm/state"; + target = "rpool_elucredassa/backup/orm/state"; recursive = true; recvOptions = "ux recordsize o compression=lz4"; - extraArgs = [ "--debug" ]; }; }; }; diff --git a/hosts/orm/default.nix b/hosts/orm/default.nix index 03472bf..6f21b57 100644 --- a/hosts/orm/default.nix +++ b/hosts/orm/default.nix @@ -40,12 +40,7 @@ openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOFa3hjej6KGmS2aQ4s46Y7U8pN4yyR2FuMofpHRwXNk syncoid@elucredassa" ]; - - # syncoid uses these if available but doesn't pull them in automatically - packages = with pkgs; [ - pkgs.mbuffer - pkgs.lzop - ]; + packages = with pkgs; [ mbuffer lzop ]; # syncoid uses these if available but doesn't pull them in automatically }; users.groups.backup = { };