aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/AppKernel.php1
-rw-r--r--app/config/config.yml13
-rw-r--r--app/config/parameters.yml.dist2
-rw-r--r--app/config/tests/parameters.yml.dist.mysql2
-rw-r--r--app/config/tests/parameters.yml.dist.pgsql2
-rw-r--r--app/config/tests/parameters.yml.dist.sqlite2
6 files changed, 22 insertions, 0 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php
index 6315fcde..2475fe16 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -28,6 +28,7 @@ class AppKernel extends Kernel
28 new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(), 28 new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(),
29 new FOS\OAuthServerBundle\FOSOAuthServerBundle(), 29 new FOS\OAuthServerBundle\FOSOAuthServerBundle(),
30 new Wallabag\UserBundle\WallabagUserBundle(), 30 new Wallabag\UserBundle\WallabagUserBundle(),
31 new Scheb\TwoFactorBundle\SchebTwoFactorBundle(),
31 ); 32 );
32 33
33 if (in_array($this->getEnvironment(), array('dev', 'test'))) { 34 if (in_array($this->getEnvironment(), array('dev', 'test'))) {
diff --git a/app/config/config.yml b/app/config/config.yml
index 0d893ecf..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"
@@ -171,3 +172,15 @@ fos_oauth_server:
171 auth_code_class: Wallabag\ApiBundle\Entity\AuthCode 172 auth_code_class: Wallabag\ApiBundle\Entity\AuthCode
172 service: 173 service:
173 user_provider: fos_user.user_manager 174 user_provider: fos_user.user_manager
175
176scheb_two_factor:
177 trusted_computer:
178 enabled: true
179 cookie_name: wllbg_trusted_computer
180 cookie_lifetime: 2592000
181
182 email:
183 enabled: %twofactor_auth%
184 sender_email: %twofactor_sender%
185 digits: 6
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: >
diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql
index d8c23634..03fdf5a6 100644
--- a/app/config/tests/parameters.yml.dist.mysql
+++ b/app/config/tests/parameters.yml.dist.mysql
@@ -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: >
diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql
index 7dc63880..675ba6c9 100644
--- a/app/config/tests/parameters.yml.dist.pgsql
+++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -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: >
diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite
index 3ef7cda4..258627af 100644
--- a/app/config/tests/parameters.yml.dist.sqlite
+++ b/app/config/tests/parameters.yml.dist.sqlite
@@ -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: >