From c9f122bcd38b0f7d775dbd197aac7dd192f0e653 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Tue, 4 Apr 2023 14:13:57 +0200
Subject: diplonat with ipv6 firewall support; email ipv6 addresses in dns

---
 cluster/prod/app/core/deploy/core-system.hcl | 2 +-
 cluster/prod/app/email/deploy/email.hcl      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cluster/prod/app/core/deploy/core-system.hcl b/cluster/prod/app/core/deploy/core-system.hcl
index 6ece3d6..004a2ef 100644
--- a/cluster/prod/app/core/deploy/core-system.hcl
+++ b/cluster/prod/app/core/deploy/core-system.hcl
@@ -13,7 +13,7 @@ job "core" {
       driver = "docker"
 
       config {
-        image = "lxpz/amd64_diplonat:4"
+        image = "lxpz/amd64_diplonat:5"
         network_mode = "host"
         readonly_rootfs = true
         privileged = true
diff --git a/cluster/prod/app/email/deploy/email.hcl b/cluster/prod/app/email/deploy/email.hcl
index 9fb249a..f4539ae 100644
--- a/cluster/prod/app/email/deploy/email.hcl
+++ b/cluster/prod/app/email/deploy/email.hcl
@@ -63,7 +63,6 @@ job "email" {
         port = "imap_port"
         tags = [
           "dovecot",
-          "d53-a imap.deuxfleurs.fr",
         ]
         check {
           type = "tcp"
@@ -83,7 +82,9 @@ job "email" {
         port = "imaps_port"
         tags = [
           "dovecot",
-          "(diplonat (tcp_port 993))"
+          "(diplonat (tcp_port 993))",
+          "d53-a imap.deuxfleurs.fr",
+          "d53-aaaa imap.deuxfleurs.fr",
         ]
 
         check {
@@ -283,8 +284,7 @@ job "email" {
           "postfix",
           "(diplonat (tcp_port 25 465 587))",
           "d53-a smtp.deuxfleurs.fr",
-          # ipv6 is commented for now as port is not open in firewall (TODO)
-          # "d53-aaaa smtp.deuxfleurs.fr"
+          "d53-aaaa smtp.deuxfleurs.fr"
         ]
         check {
           type = "tcp"
-- 
cgit v1.2.3