From 5f76ae341b0917275bd25b34126dafb9a8032a3c Mon Sep 17 00:00:00 2001
From: Julien Palard <julien@palard.fr>
Date: Sun, 12 Feb 2023 09:46:02 +0100
Subject: [PATCH] exim: Disable IPv6 to avoid unavoidable blocklists.

See 889b5aa42538e863bba9487aa834c226127ddc9e.
---
 inventory                                    | 4 ++--
 roles/exim4/defaults/main.yml                | 1 -
 roles/exim4/templates/exim4.conf.localmacros | 3 ---
 roles/exim4/templates/update-exim4.conf.conf | 1 +
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/inventory b/inventory
index 64dc960..6c4afcb 100644
--- a/inventory
+++ b/inventory
@@ -11,7 +11,7 @@ deb2.afpy.org
 deb2.afpy.org
 
 [discourse]
-discourse1.afpy.org exim4_sendonly_remote_smtp_interface=46.226.106.79  # See: https://discuss.afpy.org/t/git-afpy-org-sur-la-bl-de-spamhaus/1191/2
+discourse1.afpy.org
 
 [turn]
 turn1.afpy.org
@@ -22,7 +22,7 @@ deb2.afpy.org
 [rsnapshotted]
 deb2.afpy.org
 bbb2.afpy.org
-gitea1.afpy.org exim4_sendonly_remote_smtp_interface=46.226.104.208  # See: https://discuss.afpy.org/t/git-afpy-org-sur-la-bl-de-spamhaus/1191/2
+gitea1.afpy.org
 discourse1.afpy.org
 
 [rsnapshoter]
diff --git a/roles/exim4/defaults/main.yml b/roles/exim4/defaults/main.yml
index ceee139..aa6b0ca 100644
--- a/roles/exim4/defaults/main.yml
+++ b/roles/exim4/defaults/main.yml
@@ -4,7 +4,6 @@ exim4_sendonly_fqdn: '{{ ansible_fqdn }}'
 exim4_sendonly_smarthost: ''
 exim4_sendonly_username: ''
 exim4_sendonly_password: ''
-exim4_sendonly_remote_smtp_interface: ''
 exim4_sendonly_email_addresses: []
 #  root: 'your@email.com'
 
diff --git a/roles/exim4/templates/exim4.conf.localmacros b/roles/exim4/templates/exim4.conf.localmacros
index 6d45d66..bb3f382 100755
--- a/roles/exim4/templates/exim4.conf.localmacros
+++ b/roles/exim4/templates/exim4.conf.localmacros
@@ -1,4 +1 @@
 MAIN_TLS_ENABLE = 1
-{% if exim4_sendonly_remote_smtp_interface != '' %}
-REMOTE_SMTP_INTERFACE='{{ exim4_sendonly_remote_smtp_interface }}'
-{% endif %}
diff --git a/roles/exim4/templates/update-exim4.conf.conf b/roles/exim4/templates/update-exim4.conf.conf
index 24e0246..83627f1 100644
--- a/roles/exim4/templates/update-exim4.conf.conf
+++ b/roles/exim4/templates/update-exim4.conf.conf
@@ -28,3 +28,4 @@ dc_use_split_config='true'
 dc_hide_mailname='true'
 dc_mailname_in_oh='true'
 dc_localdelivery='mail_spool'
+disable_ipv6='true'