Merge branch '109066072-zonefile-is-broken' into staging

This commit is contained in:
Matt Farnsworth 2015-11-27 16:43:11 +02:00
commit 183ab7d26c
2 changed files with 3 additions and 2 deletions

View file

@ -57,6 +57,7 @@ namespace :import do
Rake::Task['import:reserved'].invoke
Rake::Task['import:domains'].invoke
Rake::Task['import:zones'].invoke
Rake::Task['zonefile:replace_procedure'].invoke
end
desc 'Import registrars'

View file

@ -103,8 +103,8 @@ namespace :zonefile do
SELECT array_to_string(
array(
SELECT concat(
d.name_puny, '. IN DS ', dk.ds_key_tag, ' ',
dk.ds_alg, ' ', dk.ds_digest_type, ' ( ', dk.ds_digest, ' )'
d.name_puny, '. 3600 IN DS ', dk.ds_key_tag, ' ',
dk.ds_alg, ' ', dk.ds_digest_type, ' ', dk.ds_digest
)
FROM domains d
JOIN dnskeys dk ON dk.domain_id = d.id