make some bundles arch-compatible, more default packages for arch

This commit is contained in:
Franzi 2021-05-23 12:24:00 +02:00
parent c136c33a58
commit 5a182fadef
Signed by: kunsi
GPG key ID: 12E3D2136B818350
12 changed files with 170 additions and 35 deletions

View file

@ -21,6 +21,12 @@ for identifier in node.metadata.get('postfix/mynetworks', set()):
netmask = '128'
mynetworks.add(f'[{ip6}]/{netmask}')
my_package = 'pkg_pacman:postfix' if node.has_bundle('pacman') else 'pkg_apt:postfix'
pkg_pip = {
'dnsq': {},
}
files = {
'/etc/mailname': {
'content': node.metadata.get('postfix/myhostname', node.metadata['hostname']),
@ -70,7 +76,7 @@ actions = {
'command': 'newaliases',
'triggered': True,
'needs': {
'pkg_apt:postfix',
my_package,
},
},
}
@ -80,7 +86,7 @@ svc_systemd = {
'needs': {
'file:/etc/postfix/master.cf',
'file:/etc/postfix/main.cf',
'pkg_apt:',
my_package,
},
},
}

View file

@ -4,7 +4,10 @@ defaults = {
'apt': {
'packages': {
'postfix': {},
'python3-dnsq': {},
'python3-dnsq': {
# handled by pkg_pip
'installed': False,
},
},
},
'icinga2_api': {
@ -19,6 +22,11 @@ defaults = {
},
},
},
'pacman': {
'packages': {
'postfix': {},
},
},
}
if node.has_bundle('postfixadmin'):