diff --git a/SubModules/postfix/conf.sh b/SubModules/postfix/conf.sh index a8c856b..323c0a2 100644 --- a/SubModules/postfix/conf.sh +++ b/SubModules/postfix/conf.sh @@ -69,12 +69,12 @@ curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules sed -i -e 's/DOMAINname/'$hostname'/g' -e 's/SITEName/'host'/g' -e 's/ODKSec/'$odkhsec'/g' ~/OpenDKIMInit-host.sh unset odkhsec - -cat << EOF > /etc/update-motd.d/51-generalspf +/etc/update-motd.d/51-generalspf +cat << EOF > test.sh #!/bin/sh red='\e[1;31m%s\e[0m\n' printf "\n" -printf \$red "To enable mail for this server add \"ip4:\$(curl -s -4 icanhazip.com) ip6:\$(curl -s -6 icanhazip.com)\" to $hostname SPF" +printf \$red "To enable mail for this server add the folling ip's \"ip4:\$(curl -s -4 icanhazip.com) ip6:\$(curl -s -6 icanhazip.com)\" for $hostname" printf \$red "to enable DKKIM for the hostname run bash ~/OpenDKIMInit-host.sh" printf \$red "remove notice this by running \"rm /etc/update-motd.d/51-generalspf\"" printf "\n" diff --git a/SubModules/postfix/opendkim-init.sh b/SubModules/postfix/opendkim-init.sh index c9e5561..d8a035a 100644 --- a/SubModules/postfix/opendkim-init.sh +++ b/SubModules/postfix/opendkim-init.sh @@ -20,11 +20,14 @@ if [ -n "$1" ]; then fi fi echo "Required to enable mailing for this system" -echo "Please add the folloing to your SPF Record in the DNS of DOMAINname" -echo "" -echo "Optional to enable dkim" +echo "Please add the folloing to your SPF Record in the DNS of DOMAINname," echo "ip4:$(curl -s -4 icanhazip.com) ip6:$(curl -s -6 icanhazip.com)" -echo "Please add the folloing TXT Record to the DNS of DOMAINname" +echo "" +echo "Alternatively use the 'a' and 'mx' in the SPF record just make sure the server has an 'A' and 'AAA' record pointing to it" +echo "" +echo "" +echo "Optionally to enable dkim" +echo "Add the folloing TXT Record to the DNS of DOMAINname" echo "WARNING the output is split, please combine key before inserting into DNS" cat /etc/opendkim.d/keys/DOMAINname/ODKSec.txt