diff options
| -rw-r--r-- | dan/sk-2019.yml | 2 | ||||
| -rw-r--r-- | inventory/host_vars/sk-2019.yml | 12 | ||||
| -rw-r--r-- | inventory/host_vars/sk-2019vm.yml | 2 | ||||
| -rw-r--r-- | roles/zfs/sanoid/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/zfs/sanoid/templates/sanoid.conf.j2 | 3 |
5 files changed, 19 insertions, 2 deletions
diff --git a/dan/sk-2019.yml b/dan/sk-2019.yml index 35156300..6d1133f6 100644 --- a/dan/sk-2019.yml +++ b/dan/sk-2019.yml @@ -70,7 +70,7 @@ ### TODO: # # zfs create -o quota=30G -# zfs create -o quota=30G -o compress=lz4 storage/automysqlbackup +# zfs create -o quota=35G -o compress=lz4 storage/automysqlbackup # zfs create -o quota=300G -o compress=lz4 storage/vmail # zfs create -o quota=600G -o compress=lz4 storage/www # zfs create -o quota=40G -o compress=lz4 storage/log diff --git a/inventory/host_vars/sk-2019.yml b/inventory/host_vars/sk-2019.yml index 24c5fc48..90e627a5 100644 --- a/inventory/host_vars/sk-2019.yml +++ b/inventory/host_vars/sk-2019.yml @@ -54,3 +54,15 @@ zfs_sanoid_modules: use_template: production recursive: yes process_children_only: yes + storage/automysqlbackup: + use_template: automysqlbackup + +zfs_sanoid_templates_extra: + automysqlbackup: + frequently: 0 + hourly: 0 + daily: 3 + monthly: 0 + yearly: 0 + autosnap: yes + autoprune: yes diff --git a/inventory/host_vars/sk-2019vm.yml b/inventory/host_vars/sk-2019vm.yml index 404a8d37..45348c4a 100644 --- a/inventory/host_vars/sk-2019vm.yml +++ b/inventory/host_vars/sk-2019vm.yml @@ -52,6 +52,8 @@ zfs_pools: zfs_sanoid_modules: storage/vm: use_template: production + hourly: 0 ## TODO: re-enable backups once the disk has been cleaned up + daily: 0 ## recursive: yes process_children_only: yes storage/vm/sk-testvm: diff --git a/roles/zfs/sanoid/defaults/main.yml b/roles/zfs/sanoid/defaults/main.yml index 55ebbd9d..f48e9fd2 100644 --- a/roles/zfs/sanoid/defaults/main.yml +++ b/roles/zfs/sanoid/defaults/main.yml @@ -24,3 +24,5 @@ zfs_sanoid_templates: autoprune: no autosnap: no monitor: no + +zfs_sanoid_templates_extra: {} diff --git a/roles/zfs/sanoid/templates/sanoid.conf.j2 b/roles/zfs/sanoid/templates/sanoid.conf.j2 index 2f2b29b4..82eb27a9 100644 --- a/roles/zfs/sanoid/templates/sanoid.conf.j2 +++ b/roles/zfs/sanoid/templates/sanoid.conf.j2 @@ -13,7 +13,8 @@ ############################### ## templates ############################### -{% for name,options in zfs_sanoid_templates.items() %} +{% set templates = zfs_sanoid_templates | combine(zfs_sanoid_templates_extra) %} +{% for name,options in templates.items() %} [template_{{ name }}] {% for option,value in options.items() %} |