From 68169e4390b072511cea04cd0fb8bb3abbf0ecfe Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Mon, 23 Oct 2023 19:01:39 +0200
Subject: [PATCH] ok
---
.../admin/communication/websites_controller.rb | 2 +-
app/models/communication/website/with_deuxfleurs.rb | 12 ++++++++++++
app/services/deuxfleurs.rb | 6 ++++++
.../admin/communication/websites/production.html.erb | 5 +----
config/locales/communication/en.yml | 1 -
config/locales/communication/fr.yml | 1 -
6 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/app/controllers/admin/communication/websites_controller.rb b/app/controllers/admin/communication/websites_controller.rb
index 9f96565b8..cd77a5714 100644
--- a/app/controllers/admin/communication/websites_controller.rb
+++ b/app/controllers/admin/communication/websites_controller.rb
@@ -79,7 +79,7 @@ class Admin::Communication::WebsitesController < Admin::Communication::Websites:
:name, :url, :repository, :about_type, :about_id, :in_production,
:git_provider, :git_endpoint, :git_branch, :plausible_url,
:feature_posts, :feature_agenda,
- :deuxfleurs_hosting, :deuxfleurs_identifier, :default_image, :default_image_delete,
+ :deuxfleurs_hosting, :default_image, :default_image_delete,
:social_mastodon, :social_x, :social_linkedin, :social_youtube, :social_vimeo, :social_peertube, :social_instagram, :social_facebook, :social_tiktok, :social_email, :social_github,
:deployment_status_badge, :autoupdate_theme, language_ids: []
]
diff --git a/app/models/communication/website/with_deuxfleurs.rb b/app/models/communication/website/with_deuxfleurs.rb
index f1d37cc39..5b590d295 100644
--- a/app/models/communication/website/with_deuxfleurs.rb
+++ b/app/models/communication/website/with_deuxfleurs.rb
@@ -2,6 +2,7 @@ module Communication::Website::WithDeuxfleurs
extend ActiveSupport::Concern
included do
+ before_save :deuxfleurs_golive, if: :deuxfleurs_hosting
after_save :deuxfleurs_setup, if: :deuxfleurs_hosting
end
@@ -26,6 +27,17 @@ module Communication::Website::WithDeuxfleurs
end
handle_asynchronously :deuxfleurs_setup
+ def deuxfleurs_golive
+ return unless in_production_changed? && in_production
+ # https://www.test.com -> www.test.com
+ new_identifier = URI(url).host
+ if deuxfleurs.rename_bucket(self.deuxfleurs_identifier, new_identifier)
+ self.deuxfleurs_identifier = new_identifier
+ else
+ errors.add :url
+ end
+ end
+
def deuxfleurs_create_bucket
deuxfleurs_identifier = deuxfleurs.create_bucket(deuxfleurs_default_identifier)
update_columns deuxfleurs_identifier: deuxfleurs_identifier,
diff --git a/app/services/deuxfleurs.rb b/app/services/deuxfleurs.rb
index d0594d413..468bb77da 100644
--- a/app/services/deuxfleurs.rb
+++ b/app/services/deuxfleurs.rb
@@ -6,6 +6,12 @@ class Deuxfleurs
data.dig('vhost', 'name')
end
+ def rename_bucket(host, new_identifier)
+ params = "{ \"vhost\": \"#{new_identifier}\" }"
+ response = client.patch("website/#{host}", params)
+ response.status == 200
+ end
+
def default_url_for(host)
"https://#{host}.web.deuxfleurs.fr"
end
diff --git a/app/views/admin/communication/websites/production.html.erb b/app/views/admin/communication/websites/production.html.erb
index cca4f7723..7968e6a33 100644
--- a/app/views/admin/communication/websites/production.html.erb
+++ b/app/views/admin/communication/websites/production.html.erb
@@ -8,10 +8,7 @@
<div class="row">
<div class="col-xl-6">
- <%= f.input :url %>
- </div>
- <div class="col-xl-6">
- <%= f.input :deuxfleurs_identifier %>
+ <%= f.input :url %>
</div>
</div>
diff --git a/config/locales/communication/en.yml b/config/locales/communication/en.yml
index 8e5a851d2..2b114bb5d 100644
--- a/config/locales/communication/en.yml
+++ b/config/locales/communication/en.yml
@@ -415,7 +415,6 @@ en:
access_token_with_existing: Your Github or Gitlab confidential access token.<br>Leave the field blank if you don't want to change the token.
access_token_without_existing: Your Github or Gitlab confidential access token.
deployment_status_badge: "Badge URL: <a href=\"https://docs.github.com/en/actions/monitoring-and-troubleshooting-workflows/adding-a-workflow-status-badge\" target=\"_blank\">Github</a>, <a href=\"https://docs.gitlab.com/ee/user/project/badges.html\" target=\"_blank\">Gitlab</a>"
- deuxfleurs_identifier: Beware! only change this identifier if you know what you're doing!
git_branch: 'If blank, default branch will be used'
git_endpoint: 'If blank, default will be used (https://github.com or https://gitlab.com/api/v4)'
languages: 'If you select one language the website urls will not be prefixed. If you select more than one language the website will then be considered as multilingual, and therefore all urls will be prefixed with the language (/fr, /en)'
diff --git a/config/locales/communication/fr.yml b/config/locales/communication/fr.yml
index 7e7089944..e576cfb0f 100644
--- a/config/locales/communication/fr.yml
+++ b/config/locales/communication/fr.yml
@@ -415,7 +415,6 @@ fr:
access_token_with_existing: Votre jeton d'accès Github ou Gitlab confidentiel.<br>Laisser le champ vide pour ne pas le modifier.
access_token_without_existing: Votre jeton d'accès Github ou Gitlab confidentiel.
deployment_status_badge: "URL du badge : <a href=\"https://docs.github.com/en/actions/monitoring-and-troubleshooting-workflows/adding-a-workflow-status-badge\" target=\"_blank\">Github</a>, <a href=\"https://docs.gitlab.com/ee/user/project/badges.html\" target=\"_blank\">Gitlab</a>"
- deuxfleurs_identifier: Attention, ne changez cet identifiant que si vous savez ce que vous faites !
git_branch: 'Laisser vide pour la branche par défaut'
git_endpoint: 'Laisser vide pour les valeurs par défaut (https://github.com ou https://gitlab.com/api/v4)'
languages: 'Si vous sélectionnez une seule langue les urls ne seront pas préfixées. Si vous en sélectionnez plusieurs le site sera considéré comme multilingue et donc toutes les urls seront préfixées avec la langue (/fr, /en)'
--
GitLab