From 11cc4426d4a7f734318a9d18d35057b6a3f6e365 Mon Sep 17 00:00:00 2001
From: echarp <manu@echarp.org>
Date: Wed, 1 Jun 2022 15:38:03 +0200
Subject: [PATCH] Added environment variables to override logo and email
---
README.creole | 9 +++++++++
app/views/layouts/application.html.haml | 3 ++-
config/application.rb | 4 ++--
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/README.creole b/README.creole
index 2d0bcd92c..ee7f75801 100644
--- a/README.creole
+++ b/README.creole
@@ -126,6 +126,15 @@ Un moyen simple de fair tourner un serveur SMTP Ã cette adresse est d'utiliser
~ # /etc/init.d/apache2 reload
}}}
+Des variables d'environnement sont prévues pour surcharger l'adresse mail d'envoi, ainsi que le logo.
+
+Exemples:
+{{{
+ export ADL_LOGO=https://agendadulibre.qc.ca/assets/logo-adlq-e0f0cac6a29fbf64b8e0f7c957cda37fd2678ddd95fab8afa396482b70146174.png
+ export ADL_MAIL=test@exemple.com
+}}}
+
+(d'autres peuvent être rajoutées si des surcharges sont souhaitées)
== Aide mémoire
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index a7cf7f644..973475502 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -22,7 +22,8 @@
= render '/pages/search'
= link_to root_path do
- = image_tag 'baby_gnu_adl.png', alt: '', class: :logo
+ = image_tag ENV.fetch('ADL_LOGO', 'baby_gnu_adl.png'),
+ alt: '', class: :logo
%h1= link_to t('.title'), root_path
%h2= t '.subtitle'
diff --git a/config/application.rb b/config/application.rb
index 8b5cf4b43..af01bd234 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -37,8 +37,8 @@ module AgendaDuLibreRails
config.i18n.fallbacks = %i[en fr]
config.action_mailer.default_options = {
- from: 'moderateurs@agendadulibre.org',
- to: 'moderateurs@agendadulibre.org'
+ from: ENV.fetch('ADL_MAIL', 'moderateurs@agendadulibre.org'),
+ to: ENV.fetch('ADL_MAIL', 'moderateurs@agendadulibre.org')
}
# In rails 4, plugin and vendor images need to be precompiled
--
GitLab