From 6edcd745c4957e9f332b5459d17711e68a8b3e16 Mon Sep 17 00:00:00 2001 From: bananenmannfrau Date: Fri, 8 Dec 2017 11:53:02 +0100 Subject: [PATCH 1/2] makes email confirmation for user registration configurable --- root/etc/ansible/entrypoint.yml | 1 + root/etc/ansible/templates/parameters.yml.j2 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/root/etc/ansible/entrypoint.yml b/root/etc/ansible/entrypoint.yml index d3dc0d9..a07ff3d 100644 --- a/root/etc/ansible/entrypoint.yml +++ b/root/etc/ansible/entrypoint.yml @@ -22,6 +22,7 @@ mailer_password: "{{ lookup('env', 'SYMFONY__ENV__MAILER_PASSWORD')|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) }}" domain_name: "{{ lookup('env', 'SYMFONY__ENV__DOMAIN_NAME')|default('https://your-wallabag-url-instance.com', true) }}" tasks: diff --git a/root/etc/ansible/templates/parameters.yml.j2 b/root/etc/ansible/templates/parameters.yml.j2 index 8149aa2..4285931 100644 --- a/root/etc/ansible/templates/parameters.yml.j2 +++ b/root/etc/ansible/templates/parameters.yml.j2 @@ -28,7 +28,7 @@ parameters: # fosuser stuff fosuser_registration: {{ registration }} - fosuser_confirmation: true + fosuser_confirmation: {{ registration_mail_confirmation }} from_email: {{ from_email }} From dcaa6848972ed46c6de9c36d916bc17ee9f94fc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 15 Dec 2017 14:32:20 +0100 Subject: [PATCH 2/2] Updated README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index feca906..b588c29 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ Default login is `wallabag:wallabag`. - `-e SYMFONY__ENV__MAILER_PASSWORD=...`(defaults to "~", the SMTP password) - `-e SYMFONY__ENV__FROM_EMAIL=...`(defaults to "wallabag@example.com", the address wallabag uses for outgoing emails) - `-e SYMFONY__ENV__FOSUSER_REGISTRATION=...`(defaults to "true", enable or disable public user registration) +- `-e SYMFONY__ENV__FOSUSER_CONFIRMATION=...`(defaults to "true", enable or disable registration confirmation) - `-e SYMFONY__ENV__DOMAIN_NAME=...` defaults to "https://your-wallabag-url-instance.com", the URL of your wallabag instance) - `-e POPULATE_DATABASE=...`(defaults to "True". Does the DB has to be populated or is it an existing one)