From e5527cd3e00fcd8d03a48c09d052e63a007bdce6 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Fri, 27 Mar 2020 18:42:41 +0100
Subject: [PATCH] Fix vars and pass also password

---
 ansible/pre-deploy.yml | 1 +
 sbin/entrypoint.sh     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ansible/pre-deploy.yml b/ansible/pre-deploy.yml
index 57d4dad..e2d77ab 100644
--- a/ansible/pre-deploy.yml
+++ b/ansible/pre-deploy.yml
@@ -106,6 +106,7 @@
           SMTP_HOST: "{{ smtp_host }}"
           SMTP_TLS_ENABLED: "{{ smtp_tls_enabled }}"
           SMTP_USER: "{{ smtp_user }}"
+          SMTP_PASSWD: "{{ smtp_passwd }}"
           SSH_DOMAIN: "{{ ssh_domain }}"
           SSH_LISTEN_PORT: "{{ ssh_listen_port }}"
           SSH_PORT: "{{ ssh_port }}"
diff --git a/sbin/entrypoint.sh b/sbin/entrypoint.sh
index d9f9da6..1ef3867 100755
--- a/sbin/entrypoint.sh
+++ b/sbin/entrypoint.sh
@@ -84,8 +84,8 @@ setup_app_ini() {
     crudini --set "$app_ini" mailer ENABLED "${MAILER_ENABLED}"
     crudini --set "$app_ini" mailer FROM "${SMTP_FROM}"
     crudini --set "$app_ini" mailer HOST "${SMTP_HOST}"
-    crudini --set "$app_ini" mailer USER "${USER}"
-    crudini --set "$app_ini" mailer PASSWD "${PASSWD}"
+    crudini --set "$app_ini" mailer USER "${SMTP_USER}"
+    crudini --set "$app_ini" mailer PASSWD "${SMTP_PASSWD}"
 }
 
 main() {