diff --git a/bundles/nftables/items.py b/bundles/nftables/items.py index 8975d45..20e7d1c 100644 --- a/bundles/nftables/items.py +++ b/bundles/nftables/items.py @@ -1,7 +1,6 @@ -if node.has_bundle('pacman'): - package = 'pkg_pacman:nftables' -else: - package = 'pkg_apt:nftables' +pkg_apt = { + 'nftables': {}, +} directories = { # used by other bundles @@ -50,7 +49,7 @@ svc_systemd = { 'nftables': { 'needs': { 'file:/etc/nftables.conf', - package, + 'pkg_apt:nftables', }, }, } diff --git a/bundles/nftables/metadata.py b/bundles/nftables/metadata.py index 08396ce..ce718a4 100644 --- a/bundles/nftables/metadata.py +++ b/bundles/nftables/metadata.py @@ -1,39 +1,5 @@ from bundlewrap.exceptions import BundleError -defaults = { - 'apt': { - 'packages': { - 'nftables': {}, - }, - }, - 'pacman': { - 'packages': { - 'nftables': {}, -# https://github.com/bundlewrap/bundlewrap/issues/688 -# 'iptables': { -# 'installed': False, -# 'needed_by': { -# 'pkg_pacman:iptables-nft', -# }, -# }, - 'iptables-nft': { - 'needed_by': { - 'pkg_pacman:nftables', - }, - }, - }, - }, -} - -if not node.has_bundle('vmhost'): - # see comment in bundles/vmhost/items.py - defaults['apt']['packages']['iptables'] = { - 'installed': False, - 'needed_by': { - 'pkg_apt:nftables', - }, - } - @metadata_reactor.provides( 'nftables/rules/99-port_rules', )