aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config/config.yml
diff options
context:
space:
mode:
Diffstat (limited to 'app/config/config.yml')
-rw-r--r--app/config/config.yml60
1 files changed, 34 insertions, 26 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 689cccec..49b325a2 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -5,30 +5,32 @@ 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
30wallabag_core: 32wallabag_core:
31 version: 2.0.4 33 version: 2.0.7
32 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 34 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
33 languages: 35 languages:
34 en: 'English' 36 en: 'English'
@@ -54,14 +56,14 @@ 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"
61 63
62# Assetic Configuration 64# Assetic Configuration
63assetic: 65assetic:
64 debug: "%kernel.debug%" 66 debug: "%kernel.debug%"
65 use_controller: false 67 use_controller: false
66 bundles: [ ] 68 bundles: [ ]
67 #java: /usr/bin/java 69 #java: /usr/bin/java
@@ -75,14 +77,14 @@ assetic:
75# Doctrine Configuration 77# Doctrine Configuration
76doctrine: 78doctrine:
77 dbal: 79 dbal:
78 driver: "%database_driver%" 80 driver: "%database_driver%"
79 host: "%database_host%" 81 host: "%database_host%"
80 port: "%database_port%" 82 port: "%database_port%"
81 dbname: "%database_name%" 83 dbname: "%database_name%"
82 user: "%database_user%" 84 user: "%database_user%"
83 password: "%database_password%" 85 password: "%database_password%"
84 charset: UTF8 86 charset: UTF8
85 path: "%database_path%" 87 path: "%database_path%"
86 server_version: 5.6 88 server_version: 5.6
87 89
88 orm: 90 orm:
@@ -108,10 +110,11 @@ doctrine_migrations:
108# Swiftmailer Configuration 110# Swiftmailer Configuration
109swiftmailer: 111swiftmailer:
110 transport: "%mailer_transport%" 112 transport: "%mailer_transport%"
111 host: "%mailer_host%" 113 host: "%mailer_host%"
112 username: "%mailer_user%" 114 username: "%mailer_user%"
113 password: "%mailer_password%" 115 password: "%mailer_password%"
114 spool: { type: memory } 116 spool:
117 type: memory
115 118
116fos_rest: 119fos_rest:
117 param_fetcher_listener: true 120 param_fetcher_listener: true
@@ -150,6 +153,11 @@ nelmio_cors:
150 '^/api/': 153 '^/api/':
151 allow_origin: ['*'] 154 allow_origin: ['*']
152 allow_headers: ['X-Custom-Auth'] 155 allow_headers: ['X-Custom-Auth']
156 allow_methods: ['POST', 'PUT', 'PATCH','GET', 'DELETE']
157 max_age: 3600
158 '^/oauth/':
159 allow_origin: ['*']
160 allow_headers: ['X-Custom-Auth']
153 allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] 161 allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
154 max_age: 3600 162 max_age: 3600
155 '^/': 163 '^/':
@@ -169,17 +177,17 @@ liip_theme:
169 177
170 path_patterns: 178 path_patterns:
171 bundle_resource: 179 bundle_resource:
172 - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%% 180 - "%%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%"
173 181
174fos_user: 182fos_user:
175 db_driver: orm 183 db_driver: orm
176 firewall_name: main 184 firewall_name: secured_area
177 user_class: Wallabag\UserBundle\Entity\User 185 user_class: Wallabag\UserBundle\Entity\User
178 registration: 186 registration:
179 confirmation: 187 confirmation:
180 enabled: %fosuser_confirmation% 188 enabled: "%fosuser_confirmation%"
181 from_email: 189 from_email:
182 address: %from_email% 190 address: "%from_email%"
183 sender_name: wallabag 191 sender_name: wallabag
184fos_oauth_server: 192fos_oauth_server:
185 db_driver: orm 193 db_driver: orm
@@ -197,8 +205,8 @@ scheb_two_factor:
197 cookie_lifetime: 2592000 205 cookie_lifetime: 2592000
198 206
199 email: 207 email:
200 enabled: %twofactor_auth% 208 enabled: "%twofactor_auth%"
201 sender_email: %twofactor_sender% 209 sender_email: "%twofactor_sender%"
202 digits: 6 210 digits: 6
203 template: WallabagUserBundle:Authentication:form.html.twig 211 template: WallabagUserBundle:Authentication:form.html.twig
204 mailer: wallabag_user.auth_code_mailer 212 mailer: wallabag_user.auth_code_mailer