Merge branch '108848454-DS-import' into staging

This commit is contained in:
Matt Farnsworth 2015-11-25 14:38:36 +02:00
commit bf35678f0a

View file

@ -380,8 +380,6 @@ namespace :import do
protocol protocol
alg alg
public_key public_key
ds_alg
ds_digest_type
creator_str creator_str
updator_str updator_str
legacy_domain_id legacy_domain_id
@ -488,8 +486,6 @@ namespace :import do
key.protocol, key.protocol,
key.alg, key.alg,
key.key, key.key,
3, # ds_alg
1, # ds_digest_type /SHA1)
x.object_registry.try(:registrar).try(:name), x.object_registry.try(:registrar).try(:name),
x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name), x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
x.id, x.id,
@ -580,10 +576,10 @@ namespace :import do
puts '-----> Generating dnskey digests...' puts '-----> Generating dnskey digests...'
Dnskey.all.each do |x| Dnskey.all.each do |ds|
x.generate_digest ds.generate_digest
x.generate_ds_key_tag ds.generate_ds_key_tag
x.save(validate: false) ds.save(validate: false)
end end
puts "-----> Imported #{count} new domains in #{(Time.zone.now.to_f - start).round(2)} seconds" puts "-----> Imported #{count} new domains in #{(Time.zone.now.to_f - start).round(2)} seconds"