qzwi/bundlewrap
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nftables: remove pacman references

Browse source
This commit is contained in:
Rico 2021-12-21 17:10:30 +01:00
parent 8f894ff955
commit 1b1c5a8502
Signed by: stillbeben
GPG key ID: AE1066B5BD0B5041
2 changed files with 4 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bundles/nftables/items.py
View file

@ -1,7 +1,6 @@
if node.has_bundle('pacman'): pkg_apt = {
package = 'pkg_pacman:nftables' 'nftables': {},
else: }
package = 'pkg_apt:nftables'
directories = { directories = {
# used by other bundles # used by other bundles
@ -50,7 +49,7 @@ svc_systemd = {
'nftables': { 'nftables': {
'needs': { 'needs': {
'file:/etc/nftables.conf', 'file:/etc/nftables.conf',
package, 'pkg_apt:nftables',
}, },
}, },
} }

34
bundles/nftables/metadata.py
View file

@ -1,39 +1,5 @@
from bundlewrap.exceptions import BundleError 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( @metadata_reactor.provides(
'nftables/rules/99-port_rules', 'nftables/rules/99-port_rules',
) )