aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config/config.yml
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-07-20 12:02:02 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-07-20 12:02:02 +0200
commit0faeabefa7faedb3a6a3675a5e49e947554adae9 (patch)
treee51ae7db64408b159b2dfa13bfa9e01530223dc9 /app/config/config.yml
parent2bb138ef6df2d1a608b42907185b274fb87f4513 (diff)
parent317fc6e684356b645ea1327c2631c7d5fc193ddd (diff)
downloadwallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.tar.gz
wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.tar.zst
wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.zip
Merge remote-tracking branch 'origin/master' into 2.1
Diffstat (limited to 'app/config/config.yml')
-rw-r--r--app/config/config.yml41
1 files changed, 22 insertions, 19 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 29847820..a1517e97 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -5,25 +5,27 @@ imports:
5 5
6framework: 6framework:
7 #esi: ~ 7 #esi: ~
8 translator: { fallback: "%locale%" } 8 translator:
9 secret: "%secret%" 9 enabled: true
10 fallback: "%locale%"
11 secret: "%secret%"
10 router: 12 router:
11 resource: "%kernel.root_dir%/config/routing.yml" 13 resource: "%kernel.root_dir%/config/routing.yml"
12 strict_requirements: ~ 14 strict_requirements: ~
13 form: ~ 15 form: ~
14 csrf_protection: ~ 16 csrf_protection: ~
15 validation: { enable_annotations: true } 17 validation:
18 enable_annotations: true
16 templating: 19 templating:
17 engines: ['twig'] 20 engines: ['twig']
18 #assets_version: SomeVersionScheme 21 default_locale: "%locale%"
19 default_locale: "%locale%" 22 trusted_hosts: ~
20 trusted_hosts: ~
21 trusted_proxies: ~ 23 trusted_proxies: ~
22 session: 24 session:
23 # handler_id set to null will use default session handler from php.ini 25 # handler_id set to null will use default session handler from php.ini
24 handler_id: session.handler.native_file 26 handler_id: session.handler.native_file
25 save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%" 27 save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%"
26 fragments: ~ 28 fragments: ~
27 http_method_override: true 29 http_method_override: true
28 assets: ~ 30 assets: ~
29 31
@@ -54,7 +56,7 @@ wallabag_import:
54 56
55# Twig Configuration 57# Twig Configuration
56twig: 58twig:
57 debug: "%kernel.debug%" 59 debug: "%kernel.debug%"
58 strict_variables: "%kernel.debug%" 60 strict_variables: "%kernel.debug%"
59 form_themes: 61 form_themes:
60 - "LexikFormFilterBundle:Form:form_div_layout.html.twig" 62 - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
@@ -62,14 +64,14 @@ twig:
62# Doctrine Configuration 64# Doctrine Configuration
63doctrine: 65doctrine:
64 dbal: 66 dbal:
65 driver: "%database_driver%" 67 driver: "%database_driver%"
66 host: "%database_host%" 68 host: "%database_host%"
67 port: "%database_port%" 69 port: "%database_port%"
68 dbname: "%database_name%" 70 dbname: "%database_name%"
69 user: "%database_user%" 71 user: "%database_user%"
70 password: "%database_password%" 72 password: "%database_password%"
71 charset: UTF8 73 charset: UTF8
72 path: "%database_path%" 74 path: "%database_path%"
73 server_version: 5.6 75 server_version: 5.6
74 76
75 orm: 77 orm:
@@ -95,10 +97,11 @@ doctrine_migrations:
95# Swiftmailer Configuration 97# Swiftmailer Configuration
96swiftmailer: 98swiftmailer:
97 transport: "%mailer_transport%" 99 transport: "%mailer_transport%"
98 host: "%mailer_host%" 100 host: "%mailer_host%"
99 username: "%mailer_user%" 101 username: "%mailer_user%"
100 password: "%mailer_password%" 102 password: "%mailer_password%"
101 spool: { type: memory } 103 spool:
104 type: memory
102 105
103fos_rest: 106fos_rest:
104 param_fetcher_listener: true 107 param_fetcher_listener: true
@@ -160,7 +163,7 @@ liip_theme:
160 163
161fos_user: 164fos_user:
162 db_driver: orm 165 db_driver: orm
163 firewall_name: main 166 firewall_name: secured_area
164 user_class: Wallabag\UserBundle\Entity\User 167 user_class: Wallabag\UserBundle\Entity\User
165 registration: 168 registration:
166 confirmation: 169 confirmation: