diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py index 5d3f28e..eb24d95 100644 --- a/nodes/htz/ex42-1048908.py +++ b/nodes/htz/ex42-1048908.py @@ -95,46 +95,6 @@ nodes['htz.ex42-1048908'] = { }, 'worker_processes': 4, }, - 'rspamd': { - 'ignore_spam_check_for_ips': { - # entropia - ## hetzner (legacy) - '188.40.158.213', - '188.40.158.214', - '188.40.158.218', - '2a01:4f8:221:2f83:2130::2', - '2a01:4f8:221:2f83:2140::2', - '2a01:4f8:221:2f83:2180::2', - # yolocolo - '45.140.180.32/27', # Entropia e. V. - '45.140.180.112/28', # MicroPOC - '2a0e:c5c0:0:201::/64', # Entropia e. V. - '2a0e:c5c0:0:307::/64', # MicroPOC - - # ccc - '212.12.55.65', - '212.12.55.67', - '2a00:14b0:4200:3000:23:55:0:65', - - # IN-Berlin mailman - '130.133.8.35', - '192.109.42.28', - '192.109.42.122', - '193.29.188.9', - '217.197.80.23', - '217.197.80.134', - '2001:bf0:c000:a::2:134', - - # RaumZeitLabor - '5.9.77.39', - '2a01:4f8:161:9025:4::/64', - - # c3voc - '185.106.84.32/26', - '2001:67c:20a0:e::/64', - }, - 'password': bwpass.password('rspamd.mx0.kunbox.net'), - }, 'smartd': { 'disks': { '/dev/nvme0', diff --git a/nodes/rx300.py b/nodes/rx300.py index d91adad..cecf54a 100644 --- a/nodes/rx300.py +++ b/nodes/rx300.py @@ -441,9 +441,17 @@ nodes['rx300'] = { '217.197.80.23', '217.197.80.134', '2001:bf0:c000:a::2:134', + + # RaumZeitLabor + '5.9.77.39', + '2a01:4f8:161:9025:4::/64', + + # c3voc + '185.106.84.32/26', + '2001:67c:20a0:e::/64', }, # TODO change this - 'password': bwpass.password('rspamd.mx0.kunbox.net'), + 'password': bwpass.password('bw/rx300/rspamd'), 'dkim': 'uO4aNejDvVdw8BKne3KJIqAvCQMJ0416', }, 'smartd': {