diff --git a/app/models/legal_document.rb b/app/models/legal_document.rb index f9d4cb4eb..5aef34675 100644 --- a/app/models/legal_document.rb +++ b/app/models/legal_document.rb @@ -20,7 +20,7 @@ class LegalDocument < ActiveRecord::Base next if rand.to_i == 0 || rand.length < 4 dir = "#{ENV['legal_documents_dir']}/#{Time.zone.now.strftime('%Y/%m/%d')}" - FileUtils.mkdir_p(dir) + FileUtils.mkdir_p(dir, mode: 0775) self.path = "#{dir}/#{Time.zone.now.to_formatted_s(:number)}_#{rand}.#{document_type}" break unless File.file?(path) end 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' 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