diff --git a/ansible/pre-deploy.yml b/ansible/pre-deploy.yml index e2d77ab..31d2733 100644 --- a/ansible/pre-deploy.yml +++ b/ansible/pre-deploy.yml @@ -104,9 +104,10 @@ SECRET_KEY: "{{ secret_key}}" SMTP_FROM: "{{ smtp_from }}" SMTP_HOST: "{{ smtp_host }}" + SMTP_MAILER_TYPE: "{{ smtp_mailer_type }}" + SMTP_PASSWD: "{{ smtp_passwd }}" 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/ansible/vars/all.yml b/ansible/vars/all.yml index e8851a4..a9730c2 100644 --- a/ansible/vars/all.yml +++ b/ansible/vars/all.yml @@ -14,6 +14,7 @@ install_lock: "true" mailer_enabled: "true" smtp_from: "gitea-autonomic@decentral1.se" smtp_host: "mail.gandi.net:587" +smtp_mailer_type: "smtp" smtp_tls_enabled: "true" smtp_user: "gitea-autonomic@decentral1.se" ssh_domain: "git.autonomic.zone" diff --git a/sbin/entrypoint.sh b/sbin/entrypoint.sh index 1ef3867..3504da0 100755 --- a/sbin/entrypoint.sh +++ b/sbin/entrypoint.sh @@ -86,6 +86,7 @@ setup_app_ini() { crudini --set "$app_ini" mailer HOST "${SMTP_HOST}" crudini --set "$app_ini" mailer USER "${SMTP_USER}" crudini --set "$app_ini" mailer PASSWD "${SMTP_PASSWD}" + crudini --set "$app_ini" mailer MAILER_TYPE "${SMTP_MAILER_TYPE}" } main() {