Merge branch 'staging' of https://github.com/internetee/registry into staging

This commit is contained in:
Timo Võhmar 2015-11-27 20:14:28 +02:00
commit 6141c3921c
3 changed files with 4 additions and 3 deletions

View file

@ -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

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