diff --git a/utils/configure_dkim_dns.sh b/utils/configure_dkim_dns.sh index 762f1a0157ae1bbba91dfc4922601399b465f867..896f031031e0523522d8d23f3c868ceaafb1b174 100755 --- a/utils/configure_dkim_dns.sh +++ b/utils/configure_dkim_dns.sh @@ -20,16 +20,16 @@ function configure_dns () { &HostName2=www\ &RecordType2=CNAME\ &Address2=${arg_u}\ -&HostName3=mail\ -&RecordType3=CNAME\ +&HostName3=@\ +&RecordType3=MX\ &Address3=${mail_hostname}\ +&MXPref3=10\ &HostName4=@\ -&RecordType4=MX\ -&Address4=mail.${arg_u}\ -&MXPref4=10\ -&HostName5=@\ +&RecordType4=TXT\ +&Address4=v=spf1%20include:${mail_hostname}\ +&Hostname5=_dmarc\ &RecordType5=TXT\ -&Address5=v=spf1%20include:${mail_hostname}\ +&Address5=v=DMARC1;%20p=none;%20rua=mailto:support@indie.host\ &HostName6=mail._domainkey\ &RecordType6=TXT\ &Address6=${domain_key}\ @@ -37,7 +37,6 @@ function configure_dns () { &RecordType7=CNAME\ &Address7=autoconfig.`echo $mail_hostname | cut -d. -f2,3`\ &EmailType=mx" - call_API ${arguments} } diff --git a/utils/provision.sh b/utils/provision.sh index 4ee830ca0ec328692fb240de253a6aab04a1a127..7c601481e76b77ddc68d7a5f26017727c33bdf6b 100755 --- a/utils/provision.sh +++ b/utils/provision.sh @@ -28,7 +28,7 @@ LOG_LEVEL="${LOG_LEVEL:-6}" # 7 = debug -> 0 = emergency # opts & defaults from. The parsing is unforgiving so be precise in your syntax read -r -d '' usage <<-'EOF' -u [arg] URL to process. Required. - -a [arg] Application to install. (in the form github.com/indiehosters/wordress) + -a [arg] Application to install. (in the form github.com/indiehosters/wordpress) -s Start the application right away. -b Buys the associated domain name. -i Configure OpenDKIM.