diff --git a/bundles/systemd-timers/items.py b/bundles/systemd-timers/items.py index 8f3d86b..697c1fa 100644 --- a/bundles/systemd-timers/items.py +++ b/bundles/systemd-timers/items.py @@ -1,3 +1,4 @@ svc_systemd['cron'] = { 'enabled': False, + 'running': False, } diff --git a/bundles/wireguard/metadata.py b/bundles/wireguard/metadata.py index b2d782d..13b498e 100644 --- a/bundles/wireguard/metadata.py +++ b/bundles/wireguard/metadata.py @@ -7,12 +7,12 @@ from bundlewrap.metadata import atomic defaults = { 'apt': { 'packages': { - 'linux-headers-amd64': {}, + # 'linux-headers-amd64': {}, 'wireguard': { 'backports': node.os_version < (11,), - 'needs': [ - 'pkg_apt:linux-headers-amd64', - ], + # 'needs': [ + # 'pkg_apt:linux-headers-amd64', + # ], 'triggers': [ 'svc_systemd:systemd-networkd:restart', ], diff --git a/bundles/zfs/metadata.py b/bundles/zfs/metadata.py index 43543e0..6ad54a6 100644 --- a/bundles/zfs/metadata.py +++ b/bundles/zfs/metadata.py @@ -3,11 +3,11 @@ defaults = { 'apt': { 'packages': { - 'linux-headers-amd64': { - 'needed_by': { - 'pkg_apt:zfs-dkms', - }, - }, + # 'linux-headers-amd64': { + # 'needed_by': { + # 'pkg_apt:zfs-dkms', + # }, + # }, 'parted':{ 'needed_by': { 'pkg_apt:zfs-zed', diff --git a/nodes/htz.mails.py b/nodes/htz.mails.py index b884a24..2a983fb 100644 --- a/nodes/htz.mails.py +++ b/nodes/htz.mails.py @@ -150,6 +150,10 @@ '10.0.11.0/24', ], }, + 'wb.offsite-backups': { + 'route': [ + ], + }, }, }, 'zfs': { diff --git a/nodes/wb.offsite-backups.py b/nodes/wb.offsite-backups.py new file mode 100644 index 0000000..1ed1f86 --- /dev/null +++ b/nodes/wb.offsite-backups.py @@ -0,0 +1,34 @@ +{ + 'hostname': '10.0.0.148', + 'groups': [ + 'debian-11', + ], + 'bundles': [ + 'wireguard', + 'zfs', + ], + 'metadata': { + 'id': '23b898bd-203b-42d5-8150-cdb459915d77', + 'network': { + 'internal': { + 'interface': 'eth0', + 'ipv4': '10.0.0.148/24', + 'gateway4': '10.0.0.1', + }, + }, + 'wireguard': { + 'my_ip': '172.30.0.4/24', + 'peers': { + 'htz.mails': { + 'route': [ + '10.0.0.0/24', + '10.0.2.0/24', + '10.0.9.0/24', + '10.0.10.0/24', + '10.0.11.0/24', + ], + }, + }, + }, + }, +}