Sutty/panel
5
0
Fork 0
mirror of https://0xacab.org/sutty/sutty synced 2024-11-23 05:36:22 +00:00
Code Issues Projects Releases Wiki Activity

fix: no pisar las datos de njalla con los de distributed press

Browse source
This commit is contained in:
f 2023-03-31 14:38:04 -03:00
parent 92ae942e7b
commit dba55a7cbe
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/models/deploy_distributed_press.rb
View file

@ -38,7 +38,7 @@ class DeployDistributedPress < Deploy
raise DeployJob::DeployException, 'El sitio no se creó en Distributed Press' raise DeployJob::DeployException, 'El sitio no se creó en Distributed Press'
end end
if create_njalla_records? && remote_info['njalla'].blank? if create_njalla_records? && remote_info[:njalla].blank?
raise DeployJob::DeployException, 'No se pudieron crear los registros necesarios en Njalla' raise DeployJob::DeployException, 'No se pudieron crear los registros necesarios en Njalla'
end end
@ -52,7 +52,8 @@ class DeployDistributedPress < Deploy
end end
end end
update remote_info: c.show(publishing_site).to_h self.remote_info[:distributed_press] = c.show(publishing_site).to_h
save
status = c.publish(publishing_site, deploy_local.destination) status = c.publish(publishing_site, deploy_local.destination)
@ -77,7 +78,7 @@ class DeployDistributedPress < Deploy
# Devuelve las URLs de todos los protocolos # Devuelve las URLs de todos los protocolos
def urls def urls
remote_info[:links].values.map do |protocol| remote_info.dig(:distributed_press, :links).values.map do |protocol|
[ protocol[:link], protocol[:gateway] ] [ protocol[:link], protocol[:gateway] ]
end.flatten.compact.select do |link| end.flatten.compact.select do |link|
link.include? '://' link.include? '://'
@ -124,7 +125,8 @@ class DeployDistributedPress < Deploy
created_site = site_client.create(create_site) created_site = site_client.create(create_site)
self.remote_site_id = created_site[:id] self.remote_site_id = created_site[:id]
self.remote_info = created_site.to_h self.remote_info ||= {}
self.remote_info[:distributed_press] = created_site.to_h
nil nil
rescue DistributedPress::V1::Error => e rescue DistributedPress::V1::Error => e
ExceptionNotifier.notify_exception(e, data: { site: site.name }) ExceptionNotifier.notify_exception(e, data: { site: site.name })
@ -141,15 +143,15 @@ class DeployDistributedPress < Deploy
return unless create_njalla_records? return unless create_njalla_records?
self.remote_info ||= {} self.remote_info ||= {}
self.remote_info['njalla'] ||= {} self.remote_info[:njalla] ||= {}
self.remote_info['njalla']['a'] ||= njalla.add_record(name: site.name, type: 'CNAME', content: "#{Site.domain}.").to_h self.remote_info[:njalla][:a] ||= njalla.add_record(name: site.name, type: 'CNAME', content: "#{Site.domain}.").to_h
self.remote_info['njalla']['cname'] ||= njalla.add_record(name: "www.#{site.name}", type: 'CNAME', content: "#{Site.domain}.").to_h self.remote_info[:njalla][:cname] ||= njalla.add_record(name: "www.#{site.name}", type: 'CNAME', content: "#{Site.domain}.").to_h
self.remote_info['njalla']['ns'] ||= njalla.add_record(name: "_dnslink.#{site.name}", type: 'NS', content: "#{publisher.hostname}.").to_h self.remote_info[:njalla][:ns] ||= njalla.add_record(name: "_dnslink.#{site.name}", type: 'NS', content: "#{publisher.hostname}.").to_h
nil nil
rescue HTTParty::Error => e rescue HTTParty::Error => e
ExceptionNotifier.notify_exception(e, data: { site: site.name }) ExceptionNotifier.notify_exception(e, data: { site: site.name })
self.remote_info['njalla'] = nil self.remote_info.delete :njalla
ensure ensure
nil nil
end end