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

bundles/postfix: allow configuring mynetworks
All checks were successful
bundlewrap/pipeline/head This commit looks good
Details

Browse source
This commit is contained in:
Franzi 2021-03-15 11:41:35 +01:00
parent 52cab71fec
commit 3fcd81960e
Signed by: kunsi
GPG key ID: 12E3D2136B818350
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bundles/postfix/files/main.cf
View file

@ -6,7 +6,7 @@ compatibility_level = 2
myhostname = ${node.metadata.get('postfix/myhostname', node.metadata['hostname'])} myhostname = ${node.metadata.get('postfix/myhostname', node.metadata['hostname'])}
myorigin = /etc/mailname myorigin = /etc/mailname
mydestination = $myhostname, localhost mydestination = $myhostname, localhost
mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = ${' '.join(sorted(node.metadata.get('postfix/mynetworks')))}
mailbox_size_limit = 0 mailbox_size_limit = 0
recipient_delimiter = + recipient_delimiter = +
inet_protocols = all inet_protocols = all
@ -18,7 +18,7 @@ alias_maps = hash:/etc/aliases
relayhost = ${node.metadata['postfix']['relayhost']} relayhost = ${node.metadata['postfix']['relayhost']}
% endif % endif
% if node.has_bundle('postfixadmin'): % if node.has_bundle('postfixadmin') or node.has_bundle('iptables'):
inet_interfaces = all inet_interfaces = all
% else: % else:
inet_interfaces = 127.0.0.1 inet_interfaces = 127.0.0.1

7
bundles/postfix/metadata.py
View file

@ -16,6 +16,13 @@ defaults = {
}, },
}, },
}, },
'postfix': {
'mynetworks': {
'127.0.0.0/8',
'[::ffff:127.0.0.0]/104',
'[::1]/128',
},
},
} }
if node.has_bundle('postfixadmin'): if node.has_bundle('postfixadmin'):

5
nodes/home/router.py
View file

@ -125,6 +125,11 @@ nodes['home.router'] = {
'enp1s0.42': {}, 'enp1s0.42': {},
}, },
}, },
'postfix': {
'mynetworks': {
'172.19.138.0/24',
},
},
'pppd': { 'pppd': {
'username': vault.decrypt('encrypt$gAAAAABfruZ5AZbgJ3mfMLWqIMx8o4bBRMJsDPD1jElh-vWN_gnhiuZVjrQ1-7Y6zDXNkxXiyhx8rxc2enmvo26axd7EBI8FqknCptXAPruVtDZrBCis4TE='), 'username': vault.decrypt('encrypt$gAAAAABfruZ5AZbgJ3mfMLWqIMx8o4bBRMJsDPD1jElh-vWN_gnhiuZVjrQ1-7Y6zDXNkxXiyhx8rxc2enmvo26axd7EBI8FqknCptXAPruVtDZrBCis4TE='),
'password': vault.decrypt('encrypt$gAAAAABfruaXEDkaFksFMU8g97ydWyJF8p2KcSDJJBlzaOLDsLL6oCDYjG1kMPVESOzqjn8ThtSht1uZDuMCstA-sATmLS-EWQ=='), 'password': vault.decrypt('encrypt$gAAAAABfruaXEDkaFksFMU8g97ydWyJF8p2KcSDJJBlzaOLDsLL6oCDYjG1kMPVESOzqjn8ThtSht1uZDuMCstA-sATmLS-EWQ=='),