Changed: SPF record entries from softfail to hardfail

[ci skip]
i-MSCP · Mar 2, 2016 · ad13ad7 · ad13ad7
1 parent 6432aa2
commit ad13ad7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -14,6 +14,7 @@ BACKEND
 CONFIG
 	Added: imscp_panel.service systemd unit file
 	Added: OpenSSL configuration template file for self-signed SSL certificates
+	Changed: SPF record entries from softfail to hardfail
 
 DAEMON
 	Fixed: Missing chdir() and umask() calls

diff --git a/configs/debian/bind/parts/db.tpl b/configs/debian/bind/parts/db.tpl
@@ -18,7 +18,7 @@ www		IN	CNAME	@
 ftp 	IN	{IP_TYPE}	{DOMAIN_IP}
 ; dmn MAIL entry BEGIN
 @		IN 	MX	10	mail
-@		IN	TXT	"v=spf1 a mx ~all"
+@		IN	TXT	"v=spf1 a mx -all"
 mail	IN	{BASE_SERVER_IP_TYPE}	{BASE_SERVER_IP}
 imap	IN	{BASE_SERVER_IP_TYPE}	{BASE_SERVER_IP}
 pop		IN	{BASE_SERVER_IP_TYPE}	{BASE_SERVER_IP}

diff --git a/configs/debian/bind/parts/db_sub.tpl b/configs/debian/bind/parts/db_sub.tpl
@@ -4,7 +4,7 @@ $ORIGIN {SUBDOMAIN_NAME}.
 @	IN	MX	{MX_DATA}
 ; sub MX entry ENDING
 ; sub SPF entry BEGIN
-@	IN	TXT	"v=spf1 include:{DOMAIN_NAME} ~all"
+@	IN	TXT	"v=spf1 include:{DOMAIN_NAME} -all"
 ; sub SPF entry ENDING
 @	IN	{IP_TYPE}	{DOMAIN_IP}
 www	IN	CNAME	@

diff --git a/engine/PerlLib/Modules/Alias.pm b/engine/PerlLib/Modules/Alias.pm
@@ -372,11 +372,11 @@ sub _getNamedData
 		}
 
 		if(@domainHosts) {
-			push @{$self->{'named'}->{'SPF_RECORDS'}}, "@\tIN\tTXT\t\"v=spf1 mx @domainHosts ~all\""
+			push @{$self->{'named'}->{'SPF_RECORDS'}}, "@\tIN\tTXT\t\"v=spf1 mx @domainHosts -all\""
 		}
 
 		if(@wildcardHosts) {
-			push @{$self->{'named'}->{'SPF_RECORDS'}}, "*\tIN\tTXT\t\"v=spf1 mx @wildcardHosts ~all\""
+			push @{$self->{'named'}->{'SPF_RECORDS'}}, "*\tIN\tTXT\t\"v=spf1 mx @wildcardHosts -all\""
 		}
 	}
 

diff --git a/engine/PerlLib/Modules/Domain.pm b/engine/PerlLib/Modules/Domain.pm
@@ -516,11 +516,11 @@ sub _getNamedData
 		}
 
 		if(@domainHosts) {
-			push @{$self->{'named'}->{'SPF_RECORDS'}}, "@\tIN\tTXT\t\"v=spf1 mx @domainHosts ~all\""
+			push @{$self->{'named'}->{'SPF_RECORDS'}}, "@\tIN\tTXT\t\"v=spf1 mx @domainHosts -all\""
 		}
 
 		if(@wildcardHosts) {
-			push @{$self->{'named'}->{'SPF_RECORDS'}}, "*\tIN\tTXT\t\"v=spf1 mx @wildcardHosts ~all\""
+			push @{$self->{'named'}->{'SPF_RECORDS'}}, "*\tIN\tTXT\t\"v=spf1 mx @wildcardHosts -all\""
 		}
 	}