From 087bc4c6694ba4ac4e98230b528020a934c2ef84 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 21 Mar 2021 11:44:52 +0100 Subject: [PATCH] nodes: iptables for all --- groups/os.py | 1 + nodes/home/downloadhelper.py | 1 - nodes/home/router.py | 3 --- nodes/htz-cloud/miniserver.py | 4 +--- nodes/ovh/icinga2.py | 1 - 5 files changed, 2 insertions(+), 8 deletions(-) diff --git a/groups/os.py b/groups/os.py index cce9359..5f56bce 100644 --- a/groups/os.py +++ b/groups/os.py @@ -21,6 +21,7 @@ groups['linux'] = { 'backup-client', 'basic', 'cron', + 'iptables', 'molly-guard', 'openssh', 'postfix', diff --git a/nodes/home/downloadhelper.py b/nodes/home/downloadhelper.py index b7961e7..cf8d810 100644 --- a/nodes/home/downloadhelper.py +++ b/nodes/home/downloadhelper.py @@ -1,7 +1,6 @@ nodes['home.downloadhelper'] = { 'hostname': '172.19.138.27', 'bundles': { - 'iptables', 'netdata', 'nfs-client', 'transmission', diff --git a/nodes/home/router.py b/nodes/home/router.py index f8cad90..775723c 100644 --- a/nodes/home/router.py +++ b/nodes/home/router.py @@ -1,10 +1,7 @@ -from bundlewrap.metadata import atomic - nodes['home.router'] = { 'hostname': '172.19.138.1', 'bundles': { 'dhcpd', - 'iptables', 'netdata', 'nginx', 'openvpn-client', diff --git a/nodes/htz-cloud/miniserver.py b/nodes/htz-cloud/miniserver.py index a98ef77..528fa03 100644 --- a/nodes/htz-cloud/miniserver.py +++ b/nodes/htz-cloud/miniserver.py @@ -6,9 +6,7 @@ nodes['htz-cloud.miniserver'] = { 'debian-buster', 'webserver', }, - 'bundles': { - 'iptables', - }, + 'bundles': set(), 'metadata': { 'dummy': True, 'interfaces': { diff --git a/nodes/ovh/icinga2.py b/nodes/ovh/icinga2.py index 3517189..eba560e 100644 --- a/nodes/ovh/icinga2.py +++ b/nodes/ovh/icinga2.py @@ -1,7 +1,6 @@ nodes['ovh.icinga2'] = { 'bundles': { 'icinga2', - 'iptables', 'php', 'postgresql', 'simple-icinga-dashboard',