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

bundles/postfix: add SPAM BLOCKLISt for every non-private IP attached to the server
All checks were successful
bundlewrap/pipeline/head This commit looks good
Details

Browse source
This commit is contained in:
Franzi 2020-11-10 14:28:12 +01:00
parent aad1a742b7
commit f9bd2d695d
Signed by: kunsi
GPG key ID: 12E3D2136B818350
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
bundles/postfix/metadata.py
View file

@ -20,10 +20,6 @@ defaults = {
if node.has_bundle('postfixadmin'):
defaults['icinga2_api']['postfix']['services'].update({
'SPAM BLOCKLIST': {
'check_command': 'spam_blocklist',
# vars.ip will be filled using a metadata reactor
},
'SMTP CONNECT': {
'check_command': 'check_smtp',
},
@ -42,17 +38,20 @@ else:
@metadata_reactor
def fill_icinga_spam_blocklist_check_with_hostname(metadata):
if not node.has_bundle('postfixadmin'):
raise DoNotRunAgain
checks = {}
for variant, ips in repo.libs.tools.resolve_identifier(repo, node.name).items():
for ip in ips:
if not ip.is_private:
checks[f'SPAM BLOCKLIST {ip}'] = {
'check_command': 'check_rbl',
'vars.ip': str(ip),
}
return {
'icinga2_api': {
'postfix': {
'services': {
'SPAM BLOCKLIST': {
'vars.ip': metadata.get('postfix/myhostname', metadata.get('hostname', node.hostname)),
},
},
'services': checks,
},
},
}