From 7694973da4a5246c2e0ebc67a10b222233f51556 Mon Sep 17 00:00:00 2001
From: giles <giles.bradshaw@sigyl.com>
Date: Thu, 19 Oct 2023 16:12:51 +0100
Subject: [PATCH] applied mail var

---
 .drone/drone-home.yml | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml
index 3e27221..0a32d34 100644
--- a/.drone/drone-home.yml
+++ b/.drone/drone-home.yml
@@ -221,25 +221,21 @@ steps:
     - drone_build_number
     - drone_repo_name
     - drone_repo_namespace
-    - mail_service
-    - mail_user
+    - mail
     - commento_origin
     - theme
     - mysql_root_password
     script:
     - rm -f env-ghost
-    - "echo \"export MAIL_SERVICE='$${MAIL_SERVICE}'\" >> env-ghost # \"mail-service\""
-    - "echo \"export MAIL_USER='$${MAIL_USER}'\" >> env-ghost # \"mail-user\""
+    - "echo 'export MAIL=\"$${MAIL}\"' >> env-ghost # \"mail\""
     - "echo \"export COMMENTO_ORIGIN='$${COMMENTO_ORIGIN}'\" >> env-ghost # \"commento-origin\""
     - "echo \"export THEME='$${THEME}'\" >> env-ghost # \"theme\""
     - "echo \"export MYSQL_ROOT_PASSWORD='$${MYSQL_ROOT_PASSWORD}'\" >> env-ghost # \"mysql-root-password\""
   environment:
     COMMENTO_ORIGIN:
       from_secret: commento-origin
-    MAIL_SERVICE:
-      from_secret: mail-service
-    MAIL_USER:
-      from_secret: mail-user
+    MAIL:
+      from_secret: mail
     MYSQL_ROOT_PASSWORD:
       from_secret: mysql-root-password
     THEME:
@@ -337,19 +333,16 @@ steps:
     - registry_domain
     - registry_port
     - registry_password
-    - mail_service
-    - mail_user
+    - mail
     - commento_origin
     - theme
     - mysql_root_password
     - theme
     script:
     - export MYSQL_ROOT_PASSWORD=$${MYSQL_ROOT_PASSWORD}
-    - export MAIL_SERVICE=$${MAIL_SERVICE}
-    - export MAIL_USER=$${MAIL_USER}
+    - export MAIL=$${MAIL}
     - export COMMENTO_ORIGIN=$${COMMENTO_ORIGIN}
     - export THEME=$${THEME}
-    - export THEME=$${THEME}
     - export SCHEME=$${SCHEME}
     - export DOMAIN=$${DOMAIN}
     - export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN}
@@ -365,10 +358,8 @@ steps:
   environment:
     COMMENTO_ORIGIN:
       from_secret: commento-origin
-    MAIL_SERVICE:
-      from_secret: mail-service
-    MAIL_USER:
-      from_secret: mail-user
+    MAIL:
+      from_secret: mail
     MYSQL_ROOT_PASSWORD:
       from_secret: mysql-root-password
     THEME: