Merge pull request #1095 from wallabag/v2-config

V2 config

4 files changed, 8 insertions, 30 deletions

diff --git a/app/config/config.yml b/app/config/config.yml
index 7dc1bf51..33db2458 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -5,7 +5,7 @@ imports:
 
 framework:
     #esi:             ~
-    #translator:      { fallback: "%locale%" }
+    translator:      { fallback: "%locale%" }
     secret:          "%secret%"
     router:
         resource: "%kernel.root_dir%/config/routing.yml"
@@ -103,4 +103,4 @@ fos_rest:
     routing_loader:
         default_format: json
 
-nelmio_api_doc: ~
\ No newline at end of file
+nelmio_api_doc: ~
diff --git a/app/config/global.inc.php b/app/config/global.inc.php
deleted file mode 100755
index 8e62818b..00000000
--- a/app/config/global.inc.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * wallabag, self hostable application allowing you to not miss any content anymore
- *
- * @category   wallabag
- * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
- * @copyright  2013
- * @license    http://opensource.org/licenses/MIT see COPYING file
- */
-
-define('ROOT', dirname(__FILE__) . '/../..');
-
-require_once ROOT . '/vendor/autoload.php';
-
-# system configuration
-require_once __DIR__ . '/config.inc.php';
-require_once __DIR__ . '/config.inc.default.php';
-
-if (!ini_get('date.timezone') || !@date_default_timezone_set(ini_get('date.timezone'))) {
-    date_default_timezone_set('UTC');
-}
-
-if (defined('ERROR_REPORTING')) {
-    error_reporting(ERROR_REPORTING);
-}
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index e1be2e6e..44969750 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -6,7 +6,7 @@ parameters:
     database_name: symfony
     database_user: root
     database_password: ~
-    database_path: "%kernel.root_dir%/../data/db/poche.sqlite"
+    database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
 
     mailer_transport:  smtp
     mailer_host:       127.0.0.1
@@ -37,5 +37,7 @@ parameters:
     export_mobi: true
     export_pdf: true
 
-    # List view
-    items_on_page: 12
\ No newline at end of file
+    # default user config
+    items_on_page: 12
+    theme: baggy
+    language: en_US
diff --git a/app/config/services.yml b/app/config/services.yml
index d4485e42..91a03e10 100644
--- a/app/config/services.yml
+++ b/app/config/services.yml
@@ -3,6 +3,7 @@
 parameters:
     security.authentication.provider.dao.class: Wallabag\CoreBundle\Security\Authentication\Provider\WallabagAuthenticationProvider
     security.encoder.digest.class: Wallabag\CoreBundle\Security\Authentication\Encoder\WallabagPasswordEncoder
+    security.validator.user_password.class: Wallabag\CoreBundle\Security\Validator\WallabagUserPasswordValidator
 
 services:
 #    service_name: