This commit is contained in:
mwiegand 2021-09-13 10:41:00 +02:00
parent 25ba946216
commit 393aee068f
6 changed files with 12 additions and 12 deletions

View file

@ -7,7 +7,7 @@ defaults = {
}, },
'backup': { 'backup': {
'server': None, 'server': None,
'paths': [], 'paths': {},
}, },
'systemd-timers': { 'systemd-timers': {
f'backup': { f'backup': {

View file

@ -32,9 +32,9 @@ defaults = {
}, },
}, },
'backup': { 'backup': {
'paths': [ 'paths': {
'/etc/nextcloud/config.php', '/etc/nextcloud/config.php',
], },
}, },
'nextcloud': { 'nextcloud': {
'admin_user': 'admin', 'admin_user': 'admin',

View file

@ -6,9 +6,9 @@ defaults = {
} }
}, },
'backup': { 'backup': {
'paths': [ 'paths': {
'/var/vmail', '/var/vmail',
], },
}, },
'letsencrypt': { 'letsencrypt': {
'reload_after': { 'reload_after': {

View file

@ -7,9 +7,9 @@ defaults = {
}, },
}, },
'backup': { 'backup': {
'paths': [ 'paths': {
'/var/lib/postgresql', '/var/lib/postgresql',
], },
}, },
'postgresql': { 'postgresql': {
'roles': { 'roles': {
@ -20,7 +20,7 @@ defaults = {
}, },
'databases': {}, 'databases': {},
}, },
'grafana_rows': [], 'grafana_rows': {},
} }
if node.has_bundle('zfs'): if node.has_bundle('zfs'):

View file

@ -50,12 +50,12 @@ defaults = {
}, },
}, },
}, },
'grafana_rows': [ 'grafana_rows': {
'cpu', 'cpu',
'mem', 'mem',
'disk_io', 'disk_io',
'net_io', 'net_io',
], },
} }

View file

@ -103,10 +103,10 @@ def dataset_defaults(metadata):
def backup(metadata): def backup(metadata):
return { return {
'backup': { 'backup': {
'paths': [ 'paths': {
options['mountpoint'] options['mountpoint']
for options in metadata.get('zfs/datasets').values() for options in metadata.get('zfs/datasets').values()
if options.get('backup', True) if options.get('backup', True)
], },
}, },
} }