kunsi/bundlewrap
1
0
Fork 0
Code Issues 1 Pull requests 2 Releases Activity

rework firewall setup

Browse source
This commit is contained in:
Franzi 2023-09-24 20:59:58 +02:00
parent be62c1270f
commit cd48cf495d
Signed by: kunsi
GPG key ID: 12E3D2136B818350
30 changed files with 145 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

16
bundles/postfix/metadata.py
View file

@ -96,10 +96,10 @@ def letsencrypt(metadata):
@metadata_reactor.provides(
'firewall/port_rules/25',
'firewall/port_rules/465',
'firewall/port_rules/587',
'firewall/port_rules/2525',
'firewall/port_rules',
'firewall/port_rules',
'firewall/port_rules',
'firewall/port_rules',
)
def firewall(metadata):
if node.has_bundle('postfixadmin'):
@ -108,13 +108,13 @@ def firewall(metadata):
default = metadata.get('postfix/mynetworks', set())
rules = {
'25': atomic(metadata.get('postfix/restrict-to', default)),
'465': atomic(metadata.get('postfix/restrict-to', default)),
'25/tcp': atomic(metadata.get('postfix/restrict-to', default)),
'465/tcp': atomic(metadata.get('postfix/restrict-to', default)),
}
if node.has_bundle('postfixadmin'):
rules['587'] = atomic(metadata.get('postfix/restrict-to', default))
rules['2525'] = atomic(metadata.get('postfix/restrict-to', default))
rules['587/tcp'] = atomic(metadata.get('postfix/restrict-to', default))
rules['2525/tcp'] = atomic(metadata.get('postfix/restrict-to', default))
return {
'firewall': {