From f11d149272bf9a064a2c2ad00095bd0b1803d7ca Mon Sep 17 00:00:00 2001 From: oleghasjanov Date: Mon, 21 Oct 2024 13:00:23 +0300 Subject: [PATCH 1/7] added logs --- app/interactions/whois/update.rb | 9 +++++++++ app/jobs/regenerate_subzone_whoises_job.rb | 2 ++ 2 files changed, 11 insertions(+) diff --git a/app/interactions/whois/update.rb b/app/interactions/whois/update.rb index 6d3863bd5..e1cf150fa 100644 --- a/app/interactions/whois/update.rb +++ b/app/interactions/whois/update.rb @@ -36,6 +36,15 @@ module Whois if collection == Dispute collection.find_by(domain_name: name) else + puts "\n\n\n\n\n" + + puts "collection: #{collection}" + puts "name: #{name}" + puts collection == DNS::Zone + + puts "\n\n\n\n\n" + + collection == DNS::Zone ? collection.find_by(origin: name) : collection.find_by(name: name) end end diff --git a/app/jobs/regenerate_subzone_whoises_job.rb b/app/jobs/regenerate_subzone_whoises_job.rb index ea8af8a18..ee7f96680 100644 --- a/app/jobs/regenerate_subzone_whoises_job.rb +++ b/app/jobs/regenerate_subzone_whoises_job.rb @@ -7,5 +7,7 @@ class RegenerateSubzoneWhoisesJob < ApplicationJob UpdateWhoisRecordJob.perform_later zone.origin, 'zone' end + + UpdateWhoisRecordJob.perform_later 'olegwashere.ee', 'zone' end end From 0da1c084dd7a6acf33b143c9b31cc8046158d291 Mon Sep 17 00:00:00 2001 From: oleghasjanov Date: Mon, 21 Oct 2024 13:19:49 +0300 Subject: [PATCH 2/7] rollback ruby version --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index a0891f563..b50214693 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.4 +3.0.2 From fc795482f610931f552d2af25a4174ed4e1a0fb4 Mon Sep 17 00:00:00 2001 From: oleghasjanov Date: Mon, 21 Oct 2024 13:27:59 +0300 Subject: [PATCH 3/7] update ruby version --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index b50214693..75a22a26a 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.0.2 +3.0.3 From 08ce8dbbb37f877de0c9894bbc21659934476950 Mon Sep 17 00:00:00 2001 From: oleghasjanov Date: Mon, 21 Oct 2024 14:05:52 +0300 Subject: [PATCH 4/7] updated zone domain status --- app/interactions/whois/update.rb | 9 --------- app/jobs/regenerate_subzone_whoises_job.rb | 2 -- app/models/concerns/zone/whois_queryable.rb | 2 +- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/app/interactions/whois/update.rb b/app/interactions/whois/update.rb index e1cf150fa..6d3863bd5 100644 --- a/app/interactions/whois/update.rb +++ b/app/interactions/whois/update.rb @@ -36,15 +36,6 @@ module Whois if collection == Dispute collection.find_by(domain_name: name) else - puts "\n\n\n\n\n" - - puts "collection: #{collection}" - puts "name: #{name}" - puts collection == DNS::Zone - - puts "\n\n\n\n\n" - - collection == DNS::Zone ? collection.find_by(origin: name) : collection.find_by(name: name) end end diff --git a/app/jobs/regenerate_subzone_whoises_job.rb b/app/jobs/regenerate_subzone_whoises_job.rb index ee7f96680..ea8af8a18 100644 --- a/app/jobs/regenerate_subzone_whoises_job.rb +++ b/app/jobs/regenerate_subzone_whoises_job.rb @@ -7,7 +7,5 @@ class RegenerateSubzoneWhoisesJob < ApplicationJob UpdateWhoisRecordJob.perform_later zone.origin, 'zone' end - - UpdateWhoisRecordJob.perform_later 'olegwashere.ee', 'zone' end end diff --git a/app/models/concerns/zone/whois_queryable.rb b/app/models/concerns/zone/whois_queryable.rb index fe5da8ffb..f826985cf 100644 --- a/app/models/concerns/zone/whois_queryable.rb +++ b/app/models/concerns/zone/whois_queryable.rb @@ -34,7 +34,7 @@ module Zone::WhoisQueryable def domain_vars { disclaimer: Setting.registry_whois_disclaimer, name: origin, - registered: created_at.try(:to_s, :iso8601), status: ['ok (paid and in zone)'], + registered: created_at.try(:to_s, :iso8601), status: ['blocked'], changed: updated_at.try(:to_s, :iso8601), email: Setting.registry_email, admin_contacts: [contact_vars], tech_contacts: [contact_vars], nameservers: nameserver_vars, dnssec_keys: [], From 4e6865332e7f43f561713520ad84b3c9dd761ab5 Mon Sep 17 00:00:00 2001 From: oleghasjanov Date: Mon, 21 Oct 2024 14:25:12 +0300 Subject: [PATCH 5/7] update status --- app/models/concerns/zone/whois_queryable.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/concerns/zone/whois_queryable.rb b/app/models/concerns/zone/whois_queryable.rb index f826985cf..e0e2c41a5 100644 --- a/app/models/concerns/zone/whois_queryable.rb +++ b/app/models/concerns/zone/whois_queryable.rb @@ -34,7 +34,7 @@ module Zone::WhoisQueryable def domain_vars { disclaimer: Setting.registry_whois_disclaimer, name: origin, - registered: created_at.try(:to_s, :iso8601), status: ['blocked'], + registered: created_at.try(:to_s, :iso8601), status: ['Blocked'], changed: updated_at.try(:to_s, :iso8601), email: Setting.registry_email, admin_contacts: [contact_vars], tech_contacts: [contact_vars], nameservers: nameserver_vars, dnssec_keys: [], From 156fc8194daba7c3984a75dfd545c83c6ed08873 Mon Sep 17 00:00:00 2001 From: oleghasjanov Date: Mon, 21 Oct 2024 15:17:58 +0300 Subject: [PATCH 6/7] added rake task --- lib/tasks/whois.rake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/tasks/whois.rake b/lib/tasks/whois.rake index bbec1f834..a1bca80cd 100644 --- a/lib/tasks/whois.rake +++ b/lib/tasks/whois.rake @@ -43,4 +43,9 @@ namespace :whois do end puts "\n-----> all done in #{(Time.zone.now.to_f - start).round(2)} seconds" end + + desc 'Update whois status records for zones' + task update_status: :environment do + DNS::Zone.all.each(&:generate_data) + end end From d6586c7dec25a703350cd9720332f8b5c09ff11c Mon Sep 17 00:00:00 2001 From: oleghasjanov Date: Mon, 21 Oct 2024 15:19:34 +0300 Subject: [PATCH 7/7] updated rake name task --- lib/tasks/whois.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/whois.rake b/lib/tasks/whois.rake index a1bca80cd..03ba3a520 100644 --- a/lib/tasks/whois.rake +++ b/lib/tasks/whois.rake @@ -45,7 +45,7 @@ namespace :whois do end desc 'Update whois status records for zones' - task update_status: :environment do + task update_zone_statuses: :environment do DNS::Zone.all.each(&:generate_data) end end