From 213d23691cfb883e92c82f1300068e1cf309bcad Mon Sep 17 00:00:00 2001 From: Glenn Goffin Date: Fri, 23 Feb 2018 20:39:10 +0100 Subject: [PATCH 1/3] add secure email --- root/etc/ansible/entrypoint.yml | 3 +++ root/etc/ansible/templates/parameters.yml.j2 | 3 +++ root/var/www/wallabag/app/config/parameters.yml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/root/etc/ansible/entrypoint.yml b/root/etc/ansible/entrypoint.yml index a07ff3d..11c5e48 100644 --- a/root/etc/ansible/entrypoint.yml +++ b/root/etc/ansible/entrypoint.yml @@ -20,6 +20,9 @@ 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) }}" + mailer_port: "{{ lookup('env', 'SYMFONY__ENV__MAILER_PORT')|default('25', true) }}" + mailer_encryption: "{{ lookup('env', 'SYMFONY__ENV__MAILER_ENCRYPTION')|default('~', true) }}" + mailer_auth_mode: "{{ lookup('env', 'SYMFONY__ENV__MAILER_AUTH_MODE')|default('~', true) }}" from_email: "{{ lookup('env', 'SYMFONY__ENV__FROM_EMAIL')|default('wallabag@example.com', true) }}" registration: "{{ lookup('env', 'SYMFONY__ENV__FOSUSER_REGISTRATION')|default('true', true) }}" registration_mail_confirmation: "{{ lookup('env', 'SYMFONY__ENV__FOSUSER_CONFIRMATION')|default('true', true) }}" diff --git a/root/etc/ansible/templates/parameters.yml.j2 b/root/etc/ansible/templates/parameters.yml.j2 index 80de9b4..1f3d6d5 100644 --- a/root/etc/ansible/templates/parameters.yml.j2 +++ b/root/etc/ansible/templates/parameters.yml.j2 @@ -17,6 +17,9 @@ parameters: mailer_host: {{ mailer_host }} mailer_user: {{ mailer_user }} mailer_password: {{ mailer_password }} + mailer_port: {{ mailer_port }} + mailer_encryption: {{ mailer_encryption }} + mailer_auth_mode: {{ mailer_auth_mode }} locale: {{ locale }} diff --git a/root/var/www/wallabag/app/config/parameters.yml b/root/var/www/wallabag/app/config/parameters.yml index 9c4dfbb..c155342 100644 --- a/root/var/www/wallabag/app/config/parameters.yml +++ b/root/var/www/wallabag/app/config/parameters.yml @@ -25,6 +25,9 @@ parameters: mailer_host: 127.0.0.1 mailer_user: ~ mailer_password: ~ + mailer_port: 25 + mailer_encryption: ~ + mailer_auth_mode: ~ locale: en From 64fc68eb56ad78aeb1002310f13e9189b218664f Mon Sep 17 00:00:00 2001 From: Glenn Goffin Date: Sat, 24 Feb 2018 15:56:41 +0100 Subject: [PATCH 2/3] add secure email --- root/etc/ansible/templates/parameters.yml.j2 | 6 +++--- root/var/www/wallabag/app/config/parameters.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/root/etc/ansible/templates/parameters.yml.j2 b/root/etc/ansible/templates/parameters.yml.j2 index 1f3d6d5..a881fdb 100644 --- a/root/etc/ansible/templates/parameters.yml.j2 +++ b/root/etc/ansible/templates/parameters.yml.j2 @@ -13,13 +13,13 @@ parameters: domain_name: {{ domain_name }} - mailer_transport: smtp - mailer_host: {{ mailer_host }} + mailer_transport: {{ mailer_transport }} mailer_user: {{ mailer_user }} mailer_password: {{ mailer_password }} + mailer_host: {{ mailer_host }} mailer_port: {{ mailer_port }} mailer_encryption: {{ mailer_encryption }} - mailer_auth_mode: {{ mailer_auth_mode }} + mailer_auth_mode: {{ mailer_auth_mode }} locale: {{ locale }} diff --git a/root/var/www/wallabag/app/config/parameters.yml b/root/var/www/wallabag/app/config/parameters.yml index c155342..3c36cbb 100644 --- a/root/var/www/wallabag/app/config/parameters.yml +++ b/root/var/www/wallabag/app/config/parameters.yml @@ -22,12 +22,12 @@ parameters: test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite" mailer_transport: smtp - mailer_host: 127.0.0.1 mailer_user: ~ mailer_password: ~ - mailer_port: 25 + mailer_host: 127.0.0.1 + mailer_port: false mailer_encryption: ~ - mailer_auth_mode: ~ + mailer_auth_mode: ~ locale: en From 47dc65b84eb86c12d9bedbc42a0590f96683db73 Mon Sep 17 00:00:00 2001 From: Glenn Goffin Date: Sat, 24 Feb 2018 15:59:18 +0100 Subject: [PATCH 3/3] add mailer transport env variable --- root/etc/ansible/entrypoint.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/root/etc/ansible/entrypoint.yml b/root/etc/ansible/entrypoint.yml index 11c5e48..b191394 100644 --- a/root/etc/ansible/entrypoint.yml +++ b/root/etc/ansible/entrypoint.yml @@ -17,6 +17,7 @@ populate_database: "{{ lookup('env', 'POPULATE_DATABASE')|default(True, true) }}" locale: "{{ lookup('env', 'SYMFONY__ENV__LOCALE')|default('en', true) }}" secret: "{{ lookup('env', 'SYMFONY__ENV__SECRET')|default('ovmpmAWXRCabNlMgzlzFXDYmCFfzGv', true) }}" + mailer_transport: "{{ lookup('env', 'SYMFONY__ENV__MAILER_TRANSPORT')|default('smtp', 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) }}"