Merge pull request #1537 from bdunogier/update_lock

[github/wallabag/wallabag.git] / app / config / config.yml

diff --git a/app/config/config.yml b/app/config/config.yml
index a4d18c6d894b0e45ee9112d949a3cbaa2c9defdd..82c5e7c997c1a2225139c917ca21b254e03fc189 100644 (file)
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -25,6 +25,12 @@ framework:
     fragments:       ~
     http_method_override: true
 
+wallabag_core:
+    languages:
+        en: 'English'
+        fr: 'Français'
+        de: 'Deutsch'
+
 # Twig Configuration
 twig:
     debug:            "%kernel.debug%"
@@ -45,6 +51,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"
@@ -81,7 +88,6 @@ doctrine:
         auto_generate_proxy_classes: "%kernel.debug%"
         entity_managers:
             default:
-                naming_strategy: wallabag_core.doctrine.prefixed_naming_strategy
                 auto_mapping: true
 
 # Swiftmailer Configuration
@@ -160,8 +166,6 @@ fos_user:
     firewall_name: main
     user_class: Wallabag\UserBundle\Entity\User
     registration:
-        form:
-            type: wallabag_user_registration
         confirmation:
             enabled: true
 
@@ -173,3 +177,19 @@ fos_oauth_server:
     auth_code_class:     Wallabag\ApiBundle\Entity\AuthCode
     service:
         user_provider: fos_user.user_manager
+
+scheb_two_factor:
+    trusted_computer:
+        enabled: true
+        cookie_name: wllbg_trusted_computer
+        cookie_lifetime: 2592000
+
+    email:
+        enabled: %twofactor_auth%
+        sender_email: %twofactor_sender%
+        digits: 6
+        template: WallabagUserBundle:Authentication:form.html.twig
+
+kphoen_rulerz:
+    executors:
+        doctrine: true