From 76f5ecb61e87748e0d4c3a3acc0a5301d2e3a804 Mon Sep 17 00:00:00 2001 From: Marvin Steadfast Date: Fri, 28 Oct 2016 13:06:52 +0200 Subject: [PATCH] set email settings through ansible template --- root/etc/ansible/entrypoint.yml | 4 ++++ root/etc/ansible/templates/parameters.yml.j2 | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/root/etc/ansible/entrypoint.yml b/root/etc/ansible/entrypoint.yml index 05c1a4f..a641cf2 100644 --- a/root/etc/ansible/entrypoint.yml +++ b/root/etc/ansible/entrypoint.yml @@ -14,6 +14,10 @@ database_root_password_postgres: "{{ lookup('env', 'POSTGRES_PASSWORD') }}" database_user: "{{ lookup('env', 'SYMFONY__ENV__DATABASE_USER')|default('root', true) }}" secret: "{{ lookup('env', 'SYMFONY__ENV__SECRET')|default('ovmpmAWXRCabNlMgzlzFXDYmCFfzGv', true) }}" + mailer_host: "{{ lookup('env', 'SYMFONY__ENV__MAILER_HOST')|default('127.0.0.1', true) }}" + mailer_user: "{{ lookup('env', 'SYMFONY__ENV__MAILER_USER')|default('~', true) }}" + mailer_password: "{{ lookup('env', 'SYMFONY__ENV__MAILER_PASSWORD')|default('~', true) }}" + from_email: "{{ lookup('env', 'SYMFONY__ENV__FROM_EMAIL')|default('wallabag@example.com', true) }}" tasks: diff --git a/root/etc/ansible/templates/parameters.yml.j2 b/root/etc/ansible/templates/parameters.yml.j2 index bf16e32..ed771da 100644 --- a/root/etc/ansible/templates/parameters.yml.j2 +++ b/root/etc/ansible/templates/parameters.yml.j2 @@ -10,9 +10,9 @@ parameters: database_socket: null mailer_transport: smtp - mailer_host: 127.0.0.1 - mailer_user: ~ - mailer_password: ~ + mailer_host: {{ mailer_host }} + mailer_user: {{ mailer_user }} + mailer_password: {{ mailer_password }} locale: en @@ -27,7 +27,7 @@ parameters: fosuser_registration: true fosuser_confirmation: true - from_email: no-reply@wallabag.org + from_email: {{ from_email }} rss_limit: 50