From 5f62cbe095cf05417235701cab0b83f59c13bf8f Mon Sep 17 00:00:00 2001
From: UX0l0l <w4v3n@protonmail.com>
Date: Wed, 19 Jun 2024 18:15:19 +0300
Subject: [PATCH 1/3] Added IPv6 support prompt and domain input incase
 /etc/mailname is empty

---
 emailwiz.sh | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/emailwiz.sh b/emailwiz.sh
index ddfbc13..5cb3a28 100644
--- a/emailwiz.sh
+++ b/emailwiz.sh
@@ -17,20 +17,28 @@
 
 umask 0022
 
-apt-get install -y postfix postfix-pcre dovecot-imapd dovecot-pop3d dovecot-sieve opendkim opendkim-tools spamassassin spamc net-tools fail2ban bind9-host
-domain="$(cat /etc/mailname)"
+apt install -y postfix postfix-pcre dovecot-imapd dovecot-pop3d dovecot-sieve opendkim opendkim-tools spamassassin spamc net-tools fail2ban bind9-host
+domain="$(< /etc/mailname || read -p 'Domain: ' domain && printf $domain)"
 subdom=${MAIL_SUBDOM:-mail}
 maildomain="$subdom.$domain"
 certdir="/etc/letsencrypt/live/$maildomain"
 
+read -p 'Enable IPv6 support? (Y/n) ' v6choice
+
 # Preliminary record checks
 ipv4=$(host "$domain" | grep -m1 -Eo '([0-9]+\.){3}[0-9]+')
 [ -z "$ipv4" ] && echo "\033[0;31mPlease point your domain ("$domain") to your server's ipv4 address." && exit 1
-ipv6=$(host "$domain" | grep "IPv6" | awk '{print $NF}')
-[ -z "$ipv6" ] && echo "\033[0;31mPlease point your domain ("$domain") to your server's ipv6 address." && exit 1
+case "$v6choice" in
+  [nN]) ;;
+  *)
+    ipv6=$(host "$domain" | grep "IPv6" | awk '{print $NF}')
+    [ -z "$ipv6" ] && { printf "\033[0;31mPlease point your domain (%s) to your server's IPv6 address.\033[0m\n" "$domain"; exit 1; }
+    ;;
+esac
 
 # Open required mail ports, and 80, for Certbot.
-for port in 80 993 465 25 587 110 995; do
+for port in 80 993 465 25 587 110 995
+do
 	ufw allow "$port" 2>/dev/null
 done
 
@@ -213,7 +221,7 @@ service auth {
 	mode = 0660
 	user = postfix
 	group = postfix
-}
+  }
 }
 
 protocol lda {

From 04c449e9bffa6c09ee43788da5b9e197c1976f02 Mon Sep 17 00:00:00 2001
From: UX0l0l <w4v3n@protonmail.com>
Date: Sun, 23 Jun 2024 04:09:29 +0300
Subject: [PATCH 2/3] Removed unnecessary for loop

---
 emailwiz.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/emailwiz.sh b/emailwiz.sh
index 5cb3a28..a7b959a 100644
--- a/emailwiz.sh
+++ b/emailwiz.sh
@@ -37,10 +37,7 @@ case "$v6choice" in
 esac
 
 # Open required mail ports, and 80, for Certbot.
-for port in 80 993 465 25 587 110 995
-do
-	ufw allow "$port" 2>/dev/null
-done
+ufw allow 80, 993, 465, 25, 587, 110, 995/tcp 2>/dev/null
 
 [ ! -d "$certdir" ] &&
 	possiblecert="$(certbot certificates 2>/dev/null | grep "Domains:\.* \(\*\.$domain\|$maildomain\)\(\s\|$\)" -A 2 | awk '/Certificate Path/ {print $3}' | head -n1)" &&

From e58538590a32022f36ff51df8a18f6bc992b33f6 Mon Sep 17 00:00:00 2001
From: UX0l0l <w4v3n@protonmail.com>
Date: Sun, 23 Jun 2024 04:26:19 +0300
Subject: [PATCH 3/3] Made the IPv6 option in the final DNS records output
 optional depending on the v6choice variable defined by the user

---
 emailwiz.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emailwiz.sh b/emailwiz.sh
index a7b959a..4bdbcdf 100644
--- a/emailwiz.sh
+++ b/emailwiz.sh
@@ -365,7 +365,7 @@ done
 pval="$(tr -d '\n' <"/etc/postfix/dkim/$domain/$subdom.txt" | sed "s/k=rsa.* \"p=/k=rsa; p=/;s/\"\s*\"//;s/\"\s*).*//" | grep -o 'p=.*')"
 dkimentry="$subdom._domainkey.$domain	TXT	v=DKIM1; k=rsa; $pval"
 dmarcentry="_dmarc.$domain	TXT	v=DMARC1; p=reject; rua=mailto:postmaster@$domain; fo=1"
-spfentry="$domain	TXT	v=spf1 mx a:$maildomain ip4:$ipv4 ip6:$ipv6 -all"
+spfentry="$domain	TXT	v=spf1 mx a:$maildomain ip4:$ipv4 $( [ "${v6choice#n}" ] && printf 'ip6:%s' "$ipv6" ) -all"
 mxentry="$domain	MX	10	$maildomain	300"
 
 useradd -m -G mail postmaster