From 82b84aacc5c691ed96dd87576be3a2af073e9088 Mon Sep 17 00:00:00 2001 From: mwiegand Date: Mon, 20 Sep 2021 09:57:59 +0200 Subject: [PATCH] wip --- groups/all.py | 4 ++-- nodes/htz.games.py | 5 +++++ nodes/htz.mails.py | 2 +- nodes/wb.offsite-backups.py | 13 +++++++++---- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/groups/all.py b/groups/all.py index 65e32f9..1b8192e 100644 --- a/groups/all.py +++ b/groups/all.py @@ -6,9 +6,9 @@ ], 'metadata': { 'dns': {}, - 'nameservers': [ + 'nameservers': { '10.0.10.2', - ], + }, 'users': { 'root': { 'shell': '/usr/bin/zsh', diff --git a/nodes/htz.games.py b/nodes/htz.games.py index 895dd19..c9d1b04 100644 --- a/nodes/htz.games.py +++ b/nodes/htz.games.py @@ -11,6 +11,11 @@ 'minecraft', ], 'metadata': { + # TEMP + 'nameservers': { + '8.8.8.8', + }, + 'id': '353bb086-f3ce-4f36-8533-e91786c91ed9', 'network': { 'internal': { diff --git a/nodes/htz.mails.py b/nodes/htz.mails.py index af5e638..1d45fd4 100644 --- a/nodes/htz.mails.py +++ b/nodes/htz.mails.py @@ -152,7 +152,7 @@ }, 'wb.offsite-backups': { 'route': [ - '10.0.20.0/24', + '192.168.178.0/24', ], }, }, diff --git a/nodes/wb.offsite-backups.py b/nodes/wb.offsite-backups.py index 09bae12..3ebdeba 100644 --- a/nodes/wb.offsite-backups.py +++ b/nodes/wb.offsite-backups.py @@ -1,5 +1,5 @@ { - 'hostname': '10.0.20.2', + 'hostname': '192.168.178.20', 'groups': [ 'debian-11', ], @@ -8,12 +8,17 @@ 'zfs', ], 'metadata': { + # TEMP + 'nameservers': { + '8.8.8.8', + }, + 'id': '23b898bd-203b-42d5-8150-cdb459915d77', 'network': { 'internal': { 'interface': 'eth0', - 'ipv4': '10.0.20.2/24', - 'gateway4': '10.0.20.1', + 'ipv4': '192.168.178.20/24', + 'gateway4': '192.168.178.1', }, }, 'wireguard': { @@ -21,7 +26,7 @@ 'peers': { 'htz.mails': { 'route': [ -# '10.0.0.0/24', + '10.0.0.0/24', '10.0.2.0/24', '10.0.9.0/24', '10.0.10.0/24',