diff --git a/root/etc/ansible/entrypoint.yml b/root/etc/ansible/entrypoint.yml index 0ea229b..3e4765a 100644 --- a/root/etc/ansible/entrypoint.yml +++ b/root/etc/ansible/entrypoint.yml @@ -18,9 +18,13 @@ 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) }}" + 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 f803771..c65799b 100644 --- a/root/etc/ansible/templates/parameters.yml.j2 +++ b/root/etc/ansible/templates/parameters.yml.j2 @@ -13,10 +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 }} locale: {{ locale }} diff --git a/root/var/www/wallabag/app/config/parameters.yml b/root/var/www/wallabag/app/config/parameters.yml index 9c4dfbb..3c36cbb 100644 --- a/root/var/www/wallabag/app/config/parameters.yml +++ b/root/var/www/wallabag/app/config/parameters.yml @@ -22,9 +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_host: 127.0.0.1 + mailer_port: false + mailer_encryption: ~ + mailer_auth_mode: ~ locale: en