Merge pull request #79 from mzch/master

replace dk1 and dk2 check with default
This commit is contained in:
Will Browning 2020-09-21 13:20:17 +01:00 committed by GitHub
commit 5d633379a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -194,27 +194,15 @@ class Domain extends Model
]);
}
$dk1 = collect(dns_get_record('dk1._domainkey.' . $this->domain . '.', DNS_CNAME))
$def = collect(dns_get_record('default._domainkey.' . $this->domain . '.', DNS_CNAME))
->contains(function ($r) {
return $r['target'] === 'dk1._domainkey.' . config('anonaddy.domain');
return $r['target'] === 'default._domainkey.' . config('anonaddy.domain');
});
if (!$dk1) {
if (!$def) {
return response()->json([
'success' => false,
'message' => 'CNAME dk1._domainkey record not found. This could be due to DNS caching, please try again later.'
]);
}
$dk2 = collect(dns_get_record('dk2._domainkey.' . $this->domain . '.', DNS_CNAME))
->contains(function ($r) {
return $r['target'] === 'dk2._domainkey.' . config('anonaddy.domain');
});
if (!$dk2) {
return response()->json([
'success' => false,
'message' => 'CNAME dk2._domainkey record not found. This could be due to DNS caching, please try again later.'
'message' => 'CNAME default._domainkey record not found. This could be due to DNS caching, please try again later.'
]);
}