From ab1f170790f2f3f1bb3fbe1b57a7e6b15605f6ab Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Sat, 26 Nov 2022 23:01:12 +0100
Subject: [PATCH] Opt out of Mailu statistics, and don't hardcode domains

---
 roles/docker/tasks/services/postfix.yml |  2 +-
 roles/docker/templates/mailu.env.j2     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/roles/docker/tasks/services/postfix.yml b/roles/docker/tasks/services/postfix.yml
index 09595567..77dc7279 100644
--- a/roles/docker/tasks/services/postfix.yml
+++ b/roles/docker/tasks/services/postfix.yml
@@ -17,4 +17,4 @@
     env:
       # Get all services which have allowed_sender_domain defined
       ALLOWED_SENDER_DOMAINS: "{{ services | dict2items | selectattr('value.allowed_sender_domain', 'true') | map(attribute='value.domain') | join(' ') }}"
-      HOSTNAME: "smtp.data.coop" # the name the smtp server will identify itself as
+      HOSTNAME: "smtp.{{ base_domain }}" # the name the smtp server will identify itself as
diff --git a/roles/docker/templates/mailu.env.j2 b/roles/docker/templates/mailu.env.j2
index 68c63fb3..aa353e04 100644
--- a/roles/docker/templates/mailu.env.j2
+++ b/roles/docker/templates/mailu.env.j2
@@ -29,10 +29,10 @@ SECRET_KEY={{ mailu_secret_key }}
 SUBNET={{ services.mailu.subnet }}
 
 # Main mail domain
-DOMAIN=data.coop
+DOMAIN={{ base_domain }}
 
 # Hostnames for this server, separated with comas
-HOSTNAMES=mail.data.coop
+HOSTNAMES=mail.{{ base_domain }}
 
 # Postmaster local part (will append the main mail domain)
 POSTMASTER=admin
@@ -44,7 +44,7 @@ TLS_FLAVOR=mail
 AUTH_RATELIMIT=120/minute;1200/hour
 
 # Opt-out of statistics, replace with "True" to opt out
-DISABLE_STATISTICS=False
+DISABLE_STATISTICS=True
 
 ###################################
 # Optional features
@@ -117,10 +117,10 @@ WEB_ADMIN=/admin
 WEB_WEBMAIL=/webmail
 
 # Website name
-SITENAME=data.coop
+SITENAME={{ base_domain }}
 
 # Linked Website URL
-WEBSITE=https://mail.data.coop
+WEBSITE=https://mail.{{ base_domain }}