aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2015-02-23 20:56:09 +0100
committerNicolas Lœuillet <nicolas@loeuillet.org>2015-02-23 20:56:09 +0100
commit0e7971d8354b0923d2e8f38690b9fe46e695dd93 (patch)
tree7026acde83f5d38a9ad94d92f926d880aa233dbe /app/config
parent2f6a596760c62efd9e43602f787fa44400d522b3 (diff)
parentc641baad0ec52198d77f2018c7bf8acdfe5957ce (diff)
downloadwallabag-0e7971d8354b0923d2e8f38690b9fe46e695dd93.tar.gz
wallabag-0e7971d8354b0923d2e8f38690b9fe46e695dd93.tar.zst
wallabag-0e7971d8354b0923d2e8f38690b9fe46e695dd93.zip
Merge pull request #1095 from wallabag/v2-config
V2 config
Diffstat (limited to 'app/config')
-rw-r--r--app/config/config.yml4
-rwxr-xr-xapp/config/global.inc.php25
-rw-r--r--app/config/parameters.yml.dist8
-rw-r--r--app/config/services.yml1
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:
5 5
6framework: 6framework:
7 #esi: ~ 7 #esi: ~
8 #translator: { fallback: "%locale%" } 8 translator: { fallback: "%locale%" }
9 secret: "%secret%" 9 secret: "%secret%"
10 router: 10 router:
11 resource: "%kernel.root_dir%/config/routing.yml" 11 resource: "%kernel.root_dir%/config/routing.yml"
@@ -103,4 +103,4 @@ fos_rest:
103 routing_loader: 103 routing_loader:
104 default_format: json 104 default_format: json
105 105
106nelmio_api_doc: ~ \ No newline at end of file 106nelmio_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 @@
1<?php
2/**
3 * wallabag, self hostable application allowing you to not miss any content anymore
4 *
5 * @category wallabag
6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013
8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */
10
11define('ROOT', dirname(__FILE__) . '/../..');
12
13require_once ROOT . '/vendor/autoload.php';
14
15# system configuration
16require_once __DIR__ . '/config.inc.php';
17require_once __DIR__ . '/config.inc.default.php';
18
19if (!ini_get('date.timezone') || !@date_default_timezone_set(ini_get('date.timezone'))) {
20 date_default_timezone_set('UTC');
21}
22
23if (defined('ERROR_REPORTING')) {
24 error_reporting(ERROR_REPORTING);
25}
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:
6 database_name: symfony 6 database_name: symfony
7 database_user: root 7 database_user: root
8 database_password: ~ 8 database_password: ~
9 database_path: "%kernel.root_dir%/../data/db/poche.sqlite" 9 database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
10 10
11 mailer_transport: smtp 11 mailer_transport: smtp
12 mailer_host: 127.0.0.1 12 mailer_host: 127.0.0.1
@@ -37,5 +37,7 @@ parameters:
37 export_mobi: true 37 export_mobi: true
38 export_pdf: true 38 export_pdf: true
39 39
40 # List view 40 # default user config
41 items_on_page: 12 \ No newline at end of file 41 items_on_page: 12
42 theme: baggy
43 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 @@
3parameters: 3parameters:
4 security.authentication.provider.dao.class: Wallabag\CoreBundle\Security\Authentication\Provider\WallabagAuthenticationProvider 4 security.authentication.provider.dao.class: Wallabag\CoreBundle\Security\Authentication\Provider\WallabagAuthenticationProvider
5 security.encoder.digest.class: Wallabag\CoreBundle\Security\Authentication\Encoder\WallabagPasswordEncoder 5 security.encoder.digest.class: Wallabag\CoreBundle\Security\Authentication\Encoder\WallabagPasswordEncoder
6 security.validator.user_password.class: Wallabag\CoreBundle\Security\Validator\WallabagUserPasswordValidator
6 7
7services: 8services:
8# service_name: 9# service_name: