From 4c2c19c0925fb6db3b9d322b07d76960b59d955d Mon Sep 17 00:00:00 2001 From: Matt Farnsworth Date: Fri, 27 Nov 2015 16:41:14 +0200 Subject: [PATCH 1/2] Story #109066072 - merge changes from 108848454, insert TTL and remove parens in DS records --- lib/tasks/zonefile.rake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/tasks/zonefile.rake b/lib/tasks/zonefile.rake index 510bb60c1..5cec28cc3 100644 --- a/lib/tasks/zonefile.rake +++ b/lib/tasks/zonefile.rake @@ -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 From 65aca9c3b235d293d9eb888902392186da04a949 Mon Sep 17 00:00:00 2001 From: Matt Farnsworth Date: Fri, 27 Nov 2015 16:42:03 +0200 Subject: [PATCH 2/2] Story #109066072 - include procedure definition during db:import task --- lib/tasks/import.rake | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake index de9c17a44..58e6f06a3 100644 --- a/lib/tasks/import.rake +++ b/lib/tasks/import.rake @@ -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'