aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/config/config.yml5
-rw-r--r--app/config/parameters.yml.dist2
2 files changed, 5 insertions, 2 deletions
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:
45 export_mobi: %export_mobi% 45 export_mobi: %export_mobi%
46 export_pdf: %export_pdf% 46 export_pdf: %export_pdf%
47 version: %app.version% 47 version: %app.version%
48 twofactor_auth: %twofactor_auth%
48 warning_message: %warning_message% 49 warning_message: %warning_message%
49 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 50 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
50 flattr_url: "https://flattr.com/thing/1265480" 51 flattr_url: "https://flattr.com/thing/1265480"
@@ -179,7 +180,7 @@ scheb_two_factor:
179 cookie_lifetime: 2592000 180 cookie_lifetime: 2592000
180 181
181 email: 182 email:
182 enabled: true 183 enabled: %twofactor_auth%
183 sender_email: no-reply@wallabag.org 184 sender_email: %twofactor_sender%
184 digits: 6 185 digits: 6
185 template: WallabagUserBundle:Authentication:form.html.twig 186 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:
29 29
30 # wallabag misc 30 # wallabag misc
31 app.version: 2.0.0-alpha 31 app.version: 2.0.0-alpha
32 twofactor_auth: true
33 twofactor_sender: no-reply@wallabag.org
32 34
33 # message to display at the bottom of the page 35 # message to display at the bottom of the page
34 warning_message: > 36 warning_message: >