From e33d944796a33caafb3bb3579a2de7e57b82596c Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Fri, 10 Apr 2020 10:03:23 +0200 Subject: [PATCH] Flesh out more smtp config --- ansible/templates/alerta.conf | 3 +++ ansible/templates/alertad.conf | 4 ++-- ansible/vars/all.yml | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ansible/templates/alerta.conf b/ansible/templates/alerta.conf index 10f269c..801d2d7 100644 --- a/ansible/templates/alerta.conf +++ b/ansible/templates/alerta.conf @@ -8,6 +8,7 @@ timezone = Europe/London [alerta-mailer] amqp_url = {{ db_type }}://{{ db_user }}:{{ db_passwd }}@{{ db_loc }}/kombu +dashboard_url = https://{{ domain }} debug = True email_type = text endpoint = http://localhost:8080 @@ -15,6 +16,8 @@ key = {{ alerta_mailer_api_key }} mail_from = {{ mail_from }} mail_to = {{ mail_to }} skip_mta = False +smtp_host = {{ smtp_host }} smtp_password = {{ smtp_passwd }} +smtp_port = {{ smtp_port }} smtp_starttls = True smtp_username = {{ smtp_username }} diff --git a/ansible/templates/alertad.conf b/ansible/templates/alertad.conf index d820333..9c776a0 100644 --- a/ansible/templates/alertad.conf +++ b/ansible/templates/alertad.conf @@ -68,8 +68,8 @@ DATABASE_NAME = "{{ db_name }}" EMAIL_VERIFICATION = False MAIL_FROM = "{{ mail_from }}" -SMTP_HOST = "mail.gandi.net" +SMTP_HOST = "{{ smtp_host }}" SMTP_PASSWORD = "{{ smtp_passwd }}" -SMTP_PORT = "587" +SMTP_PORT = "{{ smtp_port }}" SMTP_STARTTLS = True SMTP_USERNAME = "{{ smtp_username }}" diff --git a/ansible/vars/all.yml b/ansible/vars/all.yml index 3395b27..b6c6ca7 100644 --- a/ansible/vars/all.yml +++ b/ansible/vars/all.yml @@ -12,4 +12,6 @@ keycloak_role: "worker-owner" keycloak_url: "https://id.autonomic.zone" mail_from: "alerta-noreply@autonomic.zon" mail_to: "kaboom@autonomic.zone" +smtp_host: "mail.gandi.net" smtp_username: "alerta-noreply" +smtp_port: "587"