bundles: add zfs dataset to bundles

This commit is contained in:
Franzi 2021-07-17 10:17:39 +02:00
parent 337b660f5a
commit ce9f6dd7ba
Signed by: kunsi
GPG key ID: 12E3D2136B818350
8 changed files with 82 additions and 6 deletions

View file

@ -40,6 +40,13 @@ defaults = {
}, },
}, },
}, },
'zfs': {
'datasets': {
'tank/mautrix-telegram': {
'mountpoint': '/opt/mautrix-telegram',
},
},
},
} }

View file

@ -47,6 +47,13 @@ defaults = {
}, },
}, },
}, },
'zfs': {
'datasets': {
'tank/mautrix-whatsapp': {
'mountpoint': '/opt/mautrix-whatsapp',
},
},
},
} }

View file

@ -35,4 +35,11 @@ defaults = {
}, },
}, },
}, },
'zfs': {
'datasets': {
'tank/mx-puppet-discord': {
'mountpoint': '/opt/mx-puppet-discord',
},
},
},
} }

View file

@ -31,12 +31,6 @@ defaults = {
} }
if node.has_bundle('postfixadmin'): if node.has_bundle('postfixadmin'):
defaults['backups'] = {
'paths': {
'/var/mail',
},
}
defaults['icinga2_api']['postfix']['services'].update({ defaults['icinga2_api']['postfix']['services'].update({
'SMTP CONNECT': { 'SMTP CONNECT': {
'check_command': 'check_smtp', 'check_command': 'check_smtp',
@ -52,6 +46,7 @@ if node.has_bundle('postfixadmin'):
'vars.port': '587', 'vars.port': '587',
}, },
}) })
else: else:
defaults['icinga2_api']['postfix']['services'].update({ defaults['icinga2_api']['postfix']['services'].update({
'SMTP CONNECT': { 'SMTP CONNECT': {

View file

@ -4,6 +4,11 @@ defaults = {
'postfix-pgsql': {}, 'postfix-pgsql': {},
}, },
}, },
'backups': {
'paths': {
'/var/mail',
},
},
'postfixadmin': { 'postfixadmin': {
'admin_email': 'hostmaster@kunbox.net', 'admin_email': 'hostmaster@kunbox.net',
}, },
@ -19,6 +24,16 @@ defaults = {
}, },
}, },
}, },
'zfs': {
'datasets': {
'tank/mail': {
'mountpoint': '/var/mail',
},
'tank/postfixadmin': {
'mountpoint': '/opt/postfixadmin',
},
},
},
} }

View file

@ -9,4 +9,14 @@ defaults = {
'/var/lib/radicale', '/var/lib/radicale',
}, },
}, },
'zfs': {
'datasets': {
'tank/radicale': {
'mountpoint': '/var/lib/radicale',
'needed_by': {
'pkg_apt:python3-radicale',
},
},
},
},
} }

View file

@ -18,6 +18,16 @@ defaults = {
} }
}, },
}, },
'zfs': {
'datasets': {
'tank/redis': {
'mountpoint': '/var/lib/redis',
'neeeded_by': {
'pkg_apt:redis-server',
},
},
},
},
} }
if node.has_bundle('telegraf'): if node.has_bundle('telegraf'):

View file

@ -52,6 +52,31 @@ defaults = {
'rspamd': { 'rspamd': {
'dkim': repo.vault.password_for(node.name + ' rspamd dkim key'), 'dkim': repo.vault.password_for(node.name + ' rspamd dkim key'),
}, },
'zfs': {
'datasets': {
'tank/rspamd/rspamd': {
'mountpoint': '/var/lib/rspamd',
'needed_by': {
'pkg_apt:rspamd',
},
},
'tank/rspamd/clamav': {
'mountpoint': '/var/lib/clamav',
'needed_by': {
'pkg_apt:clamav',
'pkg_apt:clamav-daemon',
'pkg_apt:clamav-freshclam',
},
},
'tank/rspamd/clamav-unofficial-sigs': {
'mountpoint': '/var/lib/clamav-unofficial-sigs',
'needed_by': {
'pkg_apt:clamav-unofficial-sigs',
'pkg_apt:clamav-freshclam',
},
},
},
},
} }