From 18cf594f8ad4bb5236274cf1326c5e6ea549a570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 15 Oct 2015 13:17:21 +0200 Subject: move 2factor activation in parameters --- app/config/config.yml | 5 +++-- app/config/parameters.yml.dist | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/config/config.yml b/app/config/config.yml index 4a2c02bf..956fdd07 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -45,6 +45,7 @@ twig: export_mobi: %export_mobi% export_pdf: %export_pdf% version: %app.version% + twofactor_auth: %twofactor_auth% warning_message: %warning_message% paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" flattr_url: "https://flattr.com/thing/1265480" @@ -179,7 +180,7 @@ scheb_two_factor: cookie_lifetime: 2592000 email: - enabled: true - sender_email: no-reply@wallabag.org + enabled: %twofactor_auth% + sender_email: %twofactor_sender% digits: 6 template: WallabagUserBundle:Authentication:form.html.twig diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index c1f6bc1b..52f9bccb 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -29,6 +29,8 @@ parameters: # wallabag misc app.version: 2.0.0-alpha + twofactor_auth: true + twofactor_sender: no-reply@wallabag.org # message to display at the bottom of the page warning_message: > -- cgit v1.2.3