From 37939a088d1192b0dae216858c92567853cc92b2 Mon Sep 17 00:00:00 2001 From: f Date: Sat, 28 Dec 2024 16:05:59 -0300 Subject: [PATCH 1/2] Revert "fix: los subdominios para los sitios vienen de un certificado wildcard #13159" This reverts commit 9e348bfdd81a4b0acce2b660940245ed40b26267. --- app/controllers/api/v1/sites_controller.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/controllers/api/v1/sites_controller.rb b/app/controllers/api/v1/sites_controller.rb index 05abc38a..71815530 100644 --- a/app/controllers/api/v1/sites_controller.rb +++ b/app/controllers/api/v1/sites_controller.rb @@ -9,7 +9,7 @@ module Api # Lista de nombres de dominios a emitir certificados def index - render json: alternative_names + api_names + www_names + render json: sites_names + alternative_names + api_names + www_names end private @@ -22,6 +22,13 @@ module Api name.end_with? ".#{Site.domain}" end + # Nombres de los sitios + def sites_names + Site.all.order(:name).pluck(:name).map do |name| + canonicalize name + end + end + # Dominios alternativos def alternative_names (DeployAlternativeDomain.all.map(&:hostname) + DeployLocalizedDomain.all.map(&:hostname)).map do |name| From bc330f8ce2f348750585ac42905d85fda2657b0e Mon Sep 17 00:00:00 2001 From: f Date: Sat, 28 Dec 2024 16:06:19 -0300 Subject: [PATCH 2/2] fix: no ignorar sitios con el dominio en name #13159 --- app/controllers/api/v1/sites_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/api/v1/sites_controller.rb b/app/controllers/api/v1/sites_controller.rb index 71815530..65cec67d 100644 --- a/app/controllers/api/v1/sites_controller.rb +++ b/app/controllers/api/v1/sites_controller.rb @@ -26,6 +26,8 @@ module Api def sites_names Site.all.order(:name).pluck(:name).map do |name| canonicalize name + end.reject do |name| + subdomain? name end end