From 7276751e42de6e4bae0bdf5412fb990149e57410 Mon Sep 17 00:00:00 2001 From: mwiegand Date: Tue, 13 Jul 2021 15:17:07 +0200 Subject: [PATCH] wip --- nodes/home.backups.py | 35 -------- nodes/home.server.py | 11 --- nodes/htz.games.py | 14 ---- nodes/htz.mails.py | 168 -------------------------------------- nodes/netcup.secondary.py | 47 ----------- 5 files changed, 275 deletions(-) delete mode 100644 nodes/home.backups.py delete mode 100644 nodes/htz.games.py delete mode 100644 nodes/htz.mails.py delete mode 100644 nodes/netcup.secondary.py diff --git a/nodes/home.backups.py b/nodes/home.backups.py deleted file mode 100644 index 3e5c9df..0000000 --- a/nodes/home.backups.py +++ /dev/null @@ -1,35 +0,0 @@ -{ - 'hostname': '10.0.0.5', - 'groups': [ - 'debian-10', - 'backup-server', - 'monitored', - ], - 'bundles': [ - 'zfs', - ], - 'metadata': { - 'id': '9cf52515-63a1-4659-a8ec-6c3c881727e5', - 'backup-server': { - 'hostname': 'backups.sublimity.de', - }, - 'network': { - 'internal': { - 'interface': 'enp1s0', - 'ipv4': '10.0.0.5/24', - 'gateway4': '10.0.0.1', - }, - }, - 'zfs': { - 'pools': { - 'tank': { - 'raidz': [ - '/dev/disk/by-id/ata-HGST_HDN726040ALE614_K3GV6TPL', - '/dev/disk/by-id/ata-HGST_HDN726040ALE614_K4KAJXEB', - '/dev/disk/by-id/ata-TOSHIBA_HDWQ140_19VZK0EMFAYG', - ], - }, - }, - }, - }, -} diff --git a/nodes/home.server.py b/nodes/home.server.py index 028a2d9..1fd46c1 100644 --- a/nodes/home.server.py +++ b/nodes/home.server.py @@ -2,11 +2,7 @@ 'hostname': '10.0.0.2', 'groups': [ # 'archive', - 'backup', 'debian-10', - 'nextcloud', - 'monitored', - 'webserver', ], 'bundles': [ 'gitea', @@ -43,7 +39,6 @@ 'writeonly_token': '!decrypt:encrypt$gAAAAABg3z6fGrOy2tNdo03RoYAXmpJoJYkfhBfpblPh_wxYfqmdjtABaD7XyV9mSh9xl8oWQlTAtCk9KndVCDQy7BJ-ju7S3HCKJ0k244Y5YKxUnQtqt9fc9nnm8XD-NOJqLKyfy0QhL_I8dFT02pygoJeCUR5NkZcTKf6julb-iGXI6vWcQgolJTYrW643pHObd-Z-vIEl', }, 'letsencrypt': { - 'delegate_to_node': 'htz.mails', }, 'nextcloud': { 'hostname': 'cloud.sublimity.de', @@ -61,12 +56,6 @@ 'wireguard': { 'my_ip': '172.30.0.2/24', 'peers': { - 'htz.mails': { - 'route': [ - '10.0.10.0/24', - '10.0.11.0/24', - ], - }, }, }, 'zfs': { diff --git a/nodes/htz.games.py b/nodes/htz.games.py deleted file mode 100644 index ad7c720..0000000 --- a/nodes/htz.games.py +++ /dev/null @@ -1,14 +0,0 @@ -{ - 'dummy': True, - 'groups': [ - 'backup', - 'debian-10', - ], - 'bundles': [ - 'steam', - 'l4d2', - ], - 'metadata': { - 'id': '353bb086-f3ce-4f36-8533-e91786c91ed9', - }, -} diff --git a/nodes/htz.mails.py b/nodes/htz.mails.py deleted file mode 100644 index f565da0..0000000 --- a/nodes/htz.mails.py +++ /dev/null @@ -1,168 +0,0 @@ -{ - 'hostname': '162.55.188.157', - 'groups': [ -# 'archive', - 'backup', - 'hetzner-cloud', - 'debian-11', - 'mailserver', - 'monitored', - 'webserver', - 'dnsserver', - ], - 'bundles': [ - 'wireguard', - 'zfs', - ], - 'metadata': { - 'id': 'ea29bdf0-0b47-4bf4-8346-67d60c9dc4ae', - 'bind': { - 'hostname': 'resolver.name', - 'zones': { - 'sublimity.de': [], - 'freibrief.net': [], - 'nadenau.net': [], - 'naeder.net': [], - 'rolfwerner.eu': [], - 'wettengl.net': [], - 'wingl.de': [], - 'woodpipe.de': [], - 'ckn.li': [], - 'islamicstate.eu': [], - 'hausamsilberberg.de': [], - }, - }, - 'dns': { - 'ckn.li': { - 'A': ['162.55.188.157'], - 'AAAA': ['2a01:4f8:1c1c:4121::2'], - }, - 'freibrief.net': { - 'A': ['162.55.188.157'], - 'AAAA': ['2a01:4f8:1c1c:4121::2'], - }, - }, - 'letsencrypt': { - 'domains': { - 'ckn.li': {}, - 'sublimity.de': {}, - 'freibrief.net': {}, - }, - }, - 'network': { - 'internal': { - 'interface': 'ens10', - 'ipv4': '10.0.10.2/24', - }, - 'external': { - 'interface': 'eth0', - 'ipv4': '162.55.188.157/32', - 'ipv6': '2a01:4f8:1c1c:4121::2/64', - 'gateway4': '172.31.1.1', - 'gateway6': 'fe80::1', - } - }, - 'mailserver': { - 'hostname': 'mail.sublimity.de', - 'admin_email': 'postmaster@sublimity.de', - 'domains': [ - 'ckn.li', - 'sublimity.de', - 'freibrief.net', - 'nadenau.net', - 'naeder.net', - 'rolfwerner.eu', - 'wettengl.net', - 'wingl.de', - 'woodpipe.de', - ], - }, - 'nginx': { - 'vhosts': { - 'cloud.sublimity.de': { - 'content': 'nginx/proxy_pass.conf', - 'context': { - 'target': 'https://cloud.sublimity.de:443', - }, - 'internal_dns': False, - }, - 'git.sublimity.de': { - 'content': 'nginx/proxy_pass.conf', - 'context': { - 'target': 'https://git.sublimity.de:443', - }, - 'internal_dns': False, - }, - 'grafana.sublimity.de': { - 'content': 'nginx/proxy_pass.conf', - 'context': { - 'target': 'https://grafana.sublimity.de:443', - }, - 'internal_dns': False, - }, - 'influxdb.sublimity.de': { - 'content': 'nginx/proxy_pass.conf', - 'context': { - 'target': 'https://influxdb.sublimity.de:443', - }, - 'internal_dns': False, - }, - 'hausamsilberberg.de': { - 'content': 'nginx/redirect.conf', - 'context': { - 'target': 'https://www.internationaler-bund.de/standort/204516', - }, - 'internal_dns': False, - }, - }, - }, - 'roundcube': { - 'product_name': 'Sublimity Mail', - 'version': '1.5-rc', - 'installer': True, - }, - 'users': { - 'root': { - 'authorized_users': [ - 'root@home.server', - ], - 'authorized_keys': [ - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHMKTJLw6Cb+MLt+9JFOkuo2QBpuA8EoTKOFpb3IFQHEq19YLMzOhcErWmzaRfiCnILhnwTQz0njS+n9Qu4aghk= root@mail.sublimity.de' - ], - }, - }, - 'vm': { - 'cores': 2, - 'ram': 8096, - }, - 'wireguard': { - 'my_ip': '172.30.0.1/24', - 'peers': { - 'home.server': { - 'route': [ - '10.0.0.0/24', - '10.0.2.0/24', - '10.0.9.0/24', - ], - }, - 'netcup.secondary': { - 'route': [ - '10.0.11.0/24', - ], - }, - }, - }, - 'zfs': { - 'pools': { - 'tank': { - 'device': '/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0-0-0-0-part2', - }, - }, - }, - 'archive': { - 'paths': { - '/var/test': {}, - }, - }, - }, -} diff --git a/nodes/netcup.secondary.py b/nodes/netcup.secondary.py deleted file mode 100644 index c9db5ee..0000000 --- a/nodes/netcup.secondary.py +++ /dev/null @@ -1,47 +0,0 @@ -{ - 'hostname': '46.38.240.85', - 'groups': [ - 'debian-10', - 'dnsserver', - ], - 'bundles': [ - 'wireguard', - ], - 'metadata': { - 'id': '890848b2-a900-4f74-ad5b-b811fbb4f0bc', - 'postfix': { - 'master_node': 'htz.mails', - 'hostname': 'mail2.sublimity.de', - }, - 'network': { - 'external': { - 'interface': 'eth0', - 'ipv4': '46.38.240.85/22', - 'gateway4': '46.38.240.1', - 'ipv6': '2a03:4000:7:534::2/64', - 'gateway6': 'fe80::1', - }, - 'internal': { - 'interface': 'eth1', - 'ipv4': '10.0.11.2/24', - }, - }, - 'bind': { - 'master_node': 'htz.mails', - 'hostname': 'second.resolver.name', - }, - 'wireguard': { - 'my_ip': '172.30.0.3/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', - ], - }, - }, - }, - }, -}