sanoid: rename templates

diff --git a/hosts/mermet/dovecot.nix b/hosts/mermet/dovecot.nix
index 17b6f99b75c2da19c69d4377f0e85352f420c969..feabbf8ca393da6174f6d204b9282ec7325ed23a 100644 (file)
--- a/hosts/mermet/dovecot.nix
+++ b/hosts/mermet/dovecot.nix
@@ -104,7 +104,7 @@ fileSystems."/var/lib/dovecot" = {
   fsType = "zfs";
 };
 services.sanoid.datasets."rpool/var/mail" = {
-  use_template = [ "local" ];
+  use_template = [ "snap" ];
   hourly = 12;
   daily = 7;
 };

diff --git a/hosts/mermet/gitolite.nix b/hosts/mermet/gitolite.nix
index 10ff8e383e71ef509570ef517e88f23a5062db65..5860cd7efe426a1ddcedd7677478df4c3cde013a 100644 (file)
--- a/hosts/mermet/gitolite.nix
+++ b/hosts/mermet/gitolite.nix
@@ -80,7 +80,7 @@ fileSystems."/var/lib/gitolite" = {
   fsType = "zfs";
 };
 services.sanoid.datasets."rpool/var/git" = {
-  use_template = [ "local" ];
+  use_template = [ "snap" ];
   daily = 7;
 };
 }

diff --git a/hosts/mermet/nginx.nix b/hosts/mermet/nginx.nix
index 529d75623dc22704bf0a8802c5a1c696e0c54f41..8d015de3008bb325c74b7e5a28fca0bb664ec608 100644 (file)
--- a/hosts/mermet/nginx.nix
+++ b/hosts/mermet/nginx.nix
@@ -36,7 +36,7 @@ fileSystems."/var/lib/nginx" = {
   fsType = "zfs";
 };
 services.sanoid.datasets."rpool/var/www" = {
-  use_template = [ "local" ];
+  use_template = [ "snap" ];
   daily = 7;
 };
 }

diff --git a/hosts/mermet/prosody.nix b/hosts/mermet/prosody.nix
index 5cc608dd4ccf27f031c7786c34733d9dbfad76ed..63ae4c8f43105cd26a3ee32123fb8d7ea7343f7a 100644 (file)
--- a/hosts/mermet/prosody.nix
+++ b/hosts/mermet/prosody.nix
@@ -56,7 +56,7 @@ fileSystems."/var/lib/prosody" = {
 };
 services.sanoid.datasets = {
   "rpool/var/prosody" = {
-    use_template = [ "local" ];
+    use_template = [ "snap" ];
     daily = 7;
   };
 };

diff --git a/hosts/mermet/public-inbox.nix b/hosts/mermet/public-inbox.nix
index 1c8e5780f4bae66450bf73f02c5da5bdfbd3cbd4..54db9cace470b9a8f7f2bee457b7226dd4d2ef9f 100644 (file)
--- a/hosts/mermet/public-inbox.nix
+++ b/hosts/mermet/public-inbox.nix
@@ -231,7 +231,7 @@ services.postfix.virtual = lib.concatMapStringsSep "\n" (name: ''
   ${name}@${domain} public-inbox@localhost
 '') (map baseNameOf repositories);
 services.sanoid.datasets."rpool/var/public-inbox" = {
-  use_template = [ "local" ];
+  use_template = [ "snap" ];
   daily = 7;
 };
 }

diff --git a/hosts/mermet/sanoid.nix b/hosts/mermet/sanoid.nix
index 7fb0a36cd427ccfaa0b2e4c0cf5877cded904f48..0da1d4fd73f6c151b7640495cb742fb56d5e98bc 100644 (file)
--- a/hosts/mermet/sanoid.nix
+++ b/hosts/mermet/sanoid.nix
@@ -25,12 +25,12 @@ systemd.services.sanoid.serviceConfig.SupplementaryGroups = [ groups."disk".name
 services.sanoid = {
   enable = true;
   templates = {
-    local = {
+    snap = {
       autosnap = true;
       autoprune = true;
       monthly = 3;
     };
-    remote = {
+    prune = {
       autosnap = false;
       autoprune = true;
       monthly = 3;
@@ -42,11 +42,11 @@ services.sanoid = {
   ];
   datasets = {
     "rpool/backup/losurdo/var/postgresql" = {
-      use_template = [ "remote" ];
+      use_template = [ "prune" ];
       daily = 31;
     };
     "rpool/backup/losurdo/var/cryptpad" = {
-      use_template = [ "remote" ];
+      use_template = [ "prune" ];
       daily = 31;
       monthly = 0;
     };

diff --git a/hosts/mermet/users.nix b/hosts/mermet/users.nix
index 3793801f8a64bbc5fa6e6d6883f4a58dd1444f0b..259a7689bbdbf4b77ed121399ee3d54c0a19fd20 100644 (file)
--- a/hosts/mermet/users.nix
+++ b/hosts/mermet/users.nix
@@ -29,18 +29,18 @@ users = {
   };
 };
 services.sanoid.datasets."rpool/home/julm/mail" = {
-  use_template = [ "local" ];
+  use_template = [ "snap" ];
   hourly = 12;
   daily = 7;
 };
 services.sanoid.datasets."rpool/home/julm/log" = {
-  use_template = [ "local" ];
+  use_template = [ "snap" ];
   hourly = 12;
   daily = 7;
   monthly = 1;
 };
 services.sanoid.datasets."rpool/backup/losurdo/home/julm/work" = {
-  use_template = [ "remote" ];
+  use_template = [ "prune" ];
   daily = 31;
 };
 networking.nftables.ruleset = ''