From 93b005ca07f58e558b28dac175f59d4913d8a251 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Sat, 18 Mar 2023 19:33:25 -0300
Subject: [PATCH 1/5] fix: volver a hacer depender la sincronizacion del zip

---
 app/models/deploy_full_rsync.rb | 1 +
 app/models/deploy_rsync.rb      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/deploy_full_rsync.rb b/app/models/deploy_full_rsync.rb
index 8f1d306e..5bdfeeff 100644
--- a/app/models/deploy_full_rsync.rb
+++ b/app/models/deploy_full_rsync.rb
@@ -6,6 +6,7 @@ class DeployFullRsync < DeployRsync
     deploy_hidden_service
     deploy_local
     deploy_www
+    deploy_zip
   ]
 
   # Sincroniza las ubicaciones alternativas también
diff --git a/app/models/deploy_rsync.rb b/app/models/deploy_rsync.rb
index ac9f19ec..1dff2d99 100644
--- a/app/models/deploy_rsync.rb
+++ b/app/models/deploy_rsync.rb
@@ -5,7 +5,7 @@
 class DeployRsync < Deploy
   store :values, accessors: %i[hostname destination host_keys], coder: JSON
 
-  DEPENDENCIES = %i[deploy_local]
+  DEPENDENCIES = %i[deploy_local deploy_zip]
 
   def deploy(output: false)
     ssh? && rsync(output: output)

From 16ed7db1d76ff24ee5c8a6d88b6c35788c22441a Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 20 Mar 2023 12:13:51 -0300
Subject: [PATCH 2/5] =?UTF-8?q?fix:=20capturar=20la=20excepci=C3=B3n=20#10?=
 =?UTF-8?q?546?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/deploy_distributed_press.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/deploy_distributed_press.rb b/app/models/deploy_distributed_press.rb
index e8d8b095..6940a83e 100644
--- a/app/models/deploy_distributed_press.rb
+++ b/app/models/deploy_distributed_press.rb
@@ -118,7 +118,7 @@ class DeployDistributedPress < Deploy
 
     self.remote_site_id = created_site[:id]
     self.remote_info = created_site.to_h
-  rescue DistributedPress::V1::Error
+  rescue DistributedPress::V1::Error => e
     ExceptionNotifier.notify_exception(e, data: { site: site.name })
   ensure
     nil

From fd46157e28eec3b9642dcfe594370653161c9654 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 20 Mar 2023 12:20:50 -0300
Subject: [PATCH 3/5] fix: siempre devolver el destino

closes ##10541

closes ##10540

closes ##10539

closes ##10538

closes ##10537

closes ##10536

closes ##10535

closes ##10534

closes ##10533
---
 app/models/deploy_zip.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/deploy_zip.rb b/app/models/deploy_zip.rb
index 5f72a728..85005470 100644
--- a/app/models/deploy_zip.rb
+++ b/app/models/deploy_zip.rb
@@ -65,6 +65,8 @@ class DeployZip < Deploy
   # @return [String]
   def destination
     Rails.root.join('_deploy', site.hostname).realpath.to_s
+  rescue Errno::ENOENT
+    Rails.root.join('_deploy', site.hostname).to_s
   end
 
   def file

From 682046d0176e62faa7547c47fa2201540c496345 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 20 Mar 2023 12:26:11 -0300
Subject: [PATCH 4/5] =?UTF-8?q?fix:=20no=20hacer=20falla=20la=20configurac?=
 =?UTF-8?q?i=C3=B3n=20si=20todav=C3=ADa=20no=20se=20gener=C3=B3=20el=20oni?=
 =?UTF-8?q?on=20#10542?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/deploys/_deploy_hidden_service.haml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/deploys/_deploy_hidden_service.haml b/app/views/deploys/_deploy_hidden_service.haml
index d6388123..9ebda012 100644
--- a/app/views/deploys/_deploy_hidden_service.haml
+++ b/app/views/deploys/_deploy_hidden_service.haml
@@ -17,7 +17,8 @@
     = sanitize_markdown t('.help', public_url: deploy.object.site.url),
       tags: %w[p strong em a]
 
-    - if deploy.object.fqdn
+    - begin
       = sanitize_markdown t('.help_2', url: deploy.object.url),
         tags: %w[p strong em a]
+    - rescue ArgumentError
 %hr/

From 66df2a971c1547d15da9815d35c512dddfcafeb3 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 23 Mar 2023 17:11:51 -0300
Subject: [PATCH 5/5] feat: guardar la api key de njalla en las credenciales

---
 app/models/deploy_distributed_press.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/deploy_distributed_press.rb b/app/models/deploy_distributed_press.rb
index 9414abc6..6a6b1d64 100644
--- a/app/models/deploy_distributed_press.rb
+++ b/app/models/deploy_distributed_press.rb
@@ -160,7 +160,7 @@ class DeployDistributedPress < Deploy
   def njalla
     @njalla ||=
       begin
-        client = Njalla::V1::Client.new(token: ENV['NJALLA_TOKEN'])
+        client = Njalla::V1::Client.new(token: Rails.application.credentials.njalla)
 
         Njalla::V1::Domain.new(domain: Site.domain, client: client)
       end