aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2017-01-27 09:34:32 +0100
committerGitHub <noreply@github.com>2017-01-27 09:34:32 +0100
commit6fb06904ecde15b1b07d0a2af945338b416cf0e2 (patch)
treee76f3e8142399316ec5660fab8c646b2c34b8336 /app/config
parent05fa529bcfde01be5d320cb532900d72cf4b0830 (diff)
parent78295b99dd1721c613f1ce52e2debbe6f6db7753 (diff)
downloadwallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.tar.gz
wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.tar.zst
wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.zip
Merge pull request #2416 from wallabag/2.2
wallabag 2.2.0
Diffstat (limited to 'app/config')
-rw-r--r--app/config/config.yml81
-rw-r--r--app/config/config_test.yml2
-rw-r--r--app/config/parameters.yml.dist19
-rw-r--r--app/config/parameters_test.yml1
-rw-r--r--app/config/routing.yml7
-rw-r--r--app/config/routing_rest.yml5
-rw-r--r--app/config/services.yml4
-rw-r--r--app/config/tests/parameters_test.mysql.yml1
-rw-r--r--app/config/tests/parameters_test.pgsql.yml1
-rw-r--r--app/config/tests/parameters_test.sqlite.yml1
10 files changed, 92 insertions, 30 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index ca0ba1d8..68f70d67 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -51,6 +51,8 @@ wallabag_core:
51 rss_limit: 50 51 rss_limit: 50
52 reading_speed: 1 52 reading_speed: 1
53 cache_lifetime: 10 53 cache_lifetime: 10
54 action_mark_as_read: 1
55 list_mode: 1
54 fetching_error_message: | 56 fetching_error_message: |
55 wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>. 57 wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
56 58
@@ -78,7 +80,7 @@ doctrine:
78 dbname: "%database_name%" 80 dbname: "%database_name%"
79 user: "%database_user%" 81 user: "%database_user%"
80 password: "%database_password%" 82 password: "%database_password%"
81 charset: UTF8 83 charset: "%database_charset%"
82 path: "%database_path%" 84 path: "%database_path%"
83 unix_socket: "%database_socket%" 85 unix_socket: "%database_socket%"
84 server_version: 5.6 86 server_version: 5.6
@@ -115,12 +117,26 @@ swiftmailer:
115fos_rest: 117fos_rest:
116 param_fetcher_listener: true 118 param_fetcher_listener: true
117 body_listener: true 119 body_listener: true
118 format_listener: true
119 view: 120 view:
121 mime_types:
122 csv:
123 - 'text/csv'
124 - 'text/plain'
125 pdf:
126 - 'application/pdf'
127 epub:
128 - 'application/epub+zip'
129 mobi:
130 - 'application/x-mobipocket-ebook'
120 view_response_listener: 'force' 131 view_response_listener: 'force'
121 formats: 132 formats:
122 xml: true 133 xml: true
123 json : true 134 json: true
135 txt: true
136 csv: true
137 pdf: true
138 epub: true
139 mobi: true
124 templating_formats: 140 templating_formats:
125 html: true 141 html: true
126 force_redirects: 142 force_redirects:
@@ -129,10 +145,21 @@ fos_rest:
129 default_engine: twig 145 default_engine: twig
130 routing_loader: 146 routing_loader:
131 default_format: json 147 default_format: json
148 format_listener:
149 enabled: true
150 rules:
151 - { path: "^/api/entries/([0-9]+)/export.(.*)", priorities: ['epub', 'mobi', 'pdf', 'txt', 'csv'], fallback_format: json, prefer_extension: false }
152 - { path: "^/api", priorities: ['json', 'xml'], fallback_format: json, prefer_extension: false }
153 - { path: "^/annotations", priorities: ['json', 'xml'], fallback_format: json, prefer_extension: false }
154 # for an unknown reason, EACH REQUEST goes to FOS\RestBundle\EventListener\FormatListener
155 # so we need to add custom rule for custom api export but also for all other routes of the application...
156 - { path: '^/', priorities: ['text/html', '*/*'], fallback_format: html, prefer_extension: false }
132 157
133nelmio_api_doc: 158nelmio_api_doc:
134 sandbox: 159 sandbox:
135 enabled: false 160 enabled: false
161 cache:
162 enabled: true
136 name: wallabag API documentation 163 name: wallabag API documentation
137 164
138nelmio_cors: 165nelmio_cors:
@@ -185,6 +212,7 @@ fos_user:
185 from_email: 212 from_email:
186 address: "%from_email%" 213 address: "%from_email%"
187 sender_name: wallabag 214 sender_name: wallabag
215
188fos_oauth_server: 216fos_oauth_server:
189 db_driver: orm 217 db_driver: orm
190 client_class: Wallabag\ApiBundle\Entity\Client 218 client_class: Wallabag\ApiBundle\Entity\Client
@@ -192,7 +220,7 @@ fos_oauth_server:
192 refresh_token_class: Wallabag\ApiBundle\Entity\RefreshToken 220 refresh_token_class: Wallabag\ApiBundle\Entity\RefreshToken
193 auth_code_class: Wallabag\ApiBundle\Entity\AuthCode 221 auth_code_class: Wallabag\ApiBundle\Entity\AuthCode
194 service: 222 service:
195 user_provider: fos_user.user_manager 223 user_provider: fos_user.user_provider.username_email
196 options: 224 options:
197 refresh_token_lifetime: 1209600 225 refresh_token_lifetime: 1209600
198 226
@@ -213,16 +241,6 @@ kphoen_rulerz:
213 executors: 241 executors:
214 doctrine: true 242 doctrine: true
215 243
216lexik_maintenance:
217 authorized:
218 ips: ['127.0.0.1']
219 driver:
220 ttl: 3600
221 class: 'Lexik\Bundle\MaintenanceBundle\Drivers\DatabaseDriver'
222 response:
223 code: 503
224 status: "wallabag Service Temporarily Unavailable"
225
226old_sound_rabbit_mq: 244old_sound_rabbit_mq:
227 connections: 245 connections:
228 default: 246 default:
@@ -243,6 +261,11 @@ old_sound_rabbit_mq:
243 exchange_options: 261 exchange_options:
244 name: 'wallabag.import.readability' 262 name: 'wallabag.import.readability'
245 type: topic 263 type: topic
264 import_pinboard:
265 connection: default
266 exchange_options:
267 name: 'wallabag.import.pinboard'
268 type: topic
246 import_instapaper: 269 import_instapaper:
247 connection: default 270 connection: default
248 exchange_options: 271 exchange_options:
@@ -277,6 +300,7 @@ old_sound_rabbit_mq:
277 queue_options: 300 queue_options:
278 name: 'wallabag.import.pocket' 301 name: 'wallabag.import.pocket'
279 callback: wallabag_import.consumer.amqp.pocket 302 callback: wallabag_import.consumer.amqp.pocket
303 qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
280 import_readability: 304 import_readability:
281 connection: default 305 connection: default
282 exchange_options: 306 exchange_options:
@@ -285,6 +309,7 @@ old_sound_rabbit_mq:
285 queue_options: 309 queue_options:
286 name: 'wallabag.import.readability' 310 name: 'wallabag.import.readability'
287 callback: wallabag_import.consumer.amqp.readability 311 callback: wallabag_import.consumer.amqp.readability
312 qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
288 import_instapaper: 313 import_instapaper:
289 connection: default 314 connection: default
290 exchange_options: 315 exchange_options:
@@ -293,6 +318,16 @@ old_sound_rabbit_mq:
293 queue_options: 318 queue_options:
294 name: 'wallabag.import.instapaper' 319 name: 'wallabag.import.instapaper'
295 callback: wallabag_import.consumer.amqp.instapaper 320 callback: wallabag_import.consumer.amqp.instapaper
321 qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
322 import_pinboard:
323 connection: default
324 exchange_options:
325 name: 'wallabag.import.pinboard'
326 type: topic
327 queue_options:
328 name: 'wallabag.import.pinboard'
329 callback: wallabag_import.consumer.amqp.pinboard
330 qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
296 import_wallabag_v1: 331 import_wallabag_v1:
297 connection: default 332 connection: default
298 exchange_options: 333 exchange_options:
@@ -301,6 +336,7 @@ old_sound_rabbit_mq:
301 queue_options: 336 queue_options:
302 name: 'wallabag.import.wallabag_v1' 337 name: 'wallabag.import.wallabag_v1'
303 callback: wallabag_import.consumer.amqp.wallabag_v1 338 callback: wallabag_import.consumer.amqp.wallabag_v1
339 qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
304 import_wallabag_v2: 340 import_wallabag_v2:
305 connection: default 341 connection: default
306 exchange_options: 342 exchange_options:
@@ -309,6 +345,7 @@ old_sound_rabbit_mq:
309 queue_options: 345 queue_options:
310 name: 'wallabag.import.wallabag_v2' 346 name: 'wallabag.import.wallabag_v2'
311 callback: wallabag_import.consumer.amqp.wallabag_v2 347 callback: wallabag_import.consumer.amqp.wallabag_v2
348 qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
312 import_firefox: 349 import_firefox:
313 connection: default 350 connection: default
314 exchange_options: 351 exchange_options:
@@ -317,6 +354,7 @@ old_sound_rabbit_mq:
317 queue_options: 354 queue_options:
318 name: 'wallabag.import.firefox' 355 name: 'wallabag.import.firefox'
319 callback: wallabag_import.consumer.amqp.firefox 356 callback: wallabag_import.consumer.amqp.firefox
357 qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
320 import_chrome: 358 import_chrome:
321 connection: default 359 connection: default
322 exchange_options: 360 exchange_options:
@@ -325,3 +363,18 @@ old_sound_rabbit_mq:
325 queue_options: 363 queue_options:
326 name: 'wallabag.import.chrome' 364 name: 'wallabag.import.chrome'
327 callback: wallabag_import.consumer.amqp.chrome 365 callback: wallabag_import.consumer.amqp.chrome
366 qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
367
368fos_js_routing:
369 routes_to_expose:
370 - homepage
371 - starred
372 - archive
373 - all
374 - tag
375 - config
376 - import
377 - developer
378 - howto
379 - fos_user_security_logout
380 - new
diff --git a/app/config/config_test.yml b/app/config/config_test.yml
index 3eab6fb2..f5e2c25e 100644
--- a/app/config/config_test.yml
+++ b/app/config/config_test.yml
@@ -28,7 +28,7 @@ doctrine:
28 dbname: "%test_database_name%" 28 dbname: "%test_database_name%"
29 user: "%test_database_user%" 29 user: "%test_database_user%"
30 password: "%test_database_password%" 30 password: "%test_database_password%"
31 charset: UTF8 31 charset: "%test_database_charset%"
32 path: "%test_database_path%" 32 path: "%test_database_path%"
33 orm: 33 orm:
34 metadata_cache_driver: 34 metadata_cache_driver:
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index ece4903a..97f51ed1 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -19,16 +19,18 @@ parameters:
19 database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite" 19 database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
20 database_table_prefix: wallabag_ 20 database_table_prefix: wallabag_
21 database_socket: null 21 database_socket: null
22 # with MySQL, use "utf8mb4" if you got problem with content with emojis
23 database_charset: utf8
22 24
23 mailer_transport: smtp 25 mailer_transport: smtp
24 mailer_host: 127.0.0.1 26 mailer_host: 127.0.0.1
25 mailer_user: ~ 27 mailer_user: ~
26 mailer_password: ~ 28 mailer_password: ~
27 29
28 locale: en 30 locale: en
29 31
30 # A secret key that's used to generate certain security-related tokens 32 # A secret key that's used to generate certain security-related tokens
31 secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv 33 secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv
32 34
33 # two factor stuff 35 # two factor stuff
34 twofactor_auth: true 36 twofactor_auth: true
@@ -47,9 +49,14 @@ parameters:
47 rabbitmq_port: 5672 49 rabbitmq_port: 5672
48 rabbitmq_user: guest 50 rabbitmq_user: guest
49 rabbitmq_password: guest 51 rabbitmq_password: guest
52 rabbitmq_prefetch_count: 10
50 53
51 # Redis processing 54 # Redis processing
52 redis_scheme: tcp 55 redis_scheme: tcp
53 redis_host: localhost 56 redis_host: localhost
54 redis_port: 6379 57 redis_port: 6379
55 redis_path: null 58 redis_path: null
59 redis_password: null
60
61 # sites credentials
62 sites_credentials: {}
diff --git a/app/config/parameters_test.yml b/app/config/parameters_test.yml
index 2943b27a..5f2e25bb 100644
--- a/app/config/parameters_test.yml
+++ b/app/config/parameters_test.yml
@@ -6,3 +6,4 @@ parameters:
6 test_database_user: null 6 test_database_user: null
7 test_database_password: null 7 test_database_password: null
8 test_database_path: '%kernel.root_dir%/../data/db/wallabag_test.sqlite' 8 test_database_path: '%kernel.root_dir%/../data/db/wallabag_test.sqlite'
9 test_database_charset: utf8
diff --git a/app/config/routing.yml b/app/config/routing.yml
index 750ed435..0bd2d130 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -17,10 +17,6 @@ wallabag_api:
17 type: annotation 17 type: annotation
18 prefix: / 18 prefix: /
19 19
20wallabag_api:
21 resource: "@WallabagApiBundle/Resources/config/routing.yml"
22 prefix: /
23
24app: 20app:
25 resource: "@WallabagCoreBundle/Controller/" 21 resource: "@WallabagCoreBundle/Controller/"
26 type: annotation 22 type: annotation
@@ -52,3 +48,6 @@ craue_config_settings_modify:
52 path: /settings 48 path: /settings
53 defaults: 49 defaults:
54 _controller: CraueConfigBundle:Settings:modify 50 _controller: CraueConfigBundle:Settings:modify
51
52fos_js_routing:
53 resource: "@FOSJsRoutingBundle/Resources/config/routing/routing.xml"
diff --git a/app/config/routing_rest.yml b/app/config/routing_rest.yml
index 52d395dd..29f4ab14 100644
--- a/app/config/routing_rest.yml
+++ b/app/config/routing_rest.yml
@@ -1,4 +1,3 @@
1Rest_Wallabag: 1Rest_Wallabag:
2 type : rest 2 type : rest
3 resource: "@WallabagApiBundle/Resources/config/routing_rest.yml" 3 resource: "@WallabagApiBundle/Resources/config/routing_rest.yml"
4
diff --git a/app/config/services.yml b/app/config/services.yml
index a57ef0f3..9a1ce80b 100644
--- a/app/config/services.yml
+++ b/app/config/services.yml
@@ -32,13 +32,13 @@ services:
32 - { name: twig.extension } 32 - { name: twig.extension }
33 33
34 wallabag.locale_listener: 34 wallabag.locale_listener:
35 class: Wallabag\CoreBundle\EventListener\LocaleListener 35 class: Wallabag\CoreBundle\Event\Listener\LocaleListener
36 arguments: ["%kernel.default_locale%"] 36 arguments: ["%kernel.default_locale%"]
37 tags: 37 tags:
38 - { name: kernel.event_subscriber } 38 - { name: kernel.event_subscriber }
39 39
40 wallabag.user_locale_listener: 40 wallabag.user_locale_listener:
41 class: Wallabag\CoreBundle\EventListener\UserLocaleListener 41 class: Wallabag\CoreBundle\Event\Listener\UserLocaleListener
42 arguments: ["@session"] 42 arguments: ["@session"]
43 tags: 43 tags:
44 - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin } 44 - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }
diff --git a/app/config/tests/parameters_test.mysql.yml b/app/config/tests/parameters_test.mysql.yml
index d8512845..bca2d466 100644
--- a/app/config/tests/parameters_test.mysql.yml
+++ b/app/config/tests/parameters_test.mysql.yml
@@ -6,3 +6,4 @@ parameters:
6 test_database_user: root 6 test_database_user: root
7 test_database_password: ~ 7 test_database_password: ~
8 test_database_path: ~ 8 test_database_path: ~
9 test_database_charset: utf8mb4
diff --git a/app/config/tests/parameters_test.pgsql.yml b/app/config/tests/parameters_test.pgsql.yml
index 41383868..3e18d4a0 100644
--- a/app/config/tests/parameters_test.pgsql.yml
+++ b/app/config/tests/parameters_test.pgsql.yml
@@ -6,3 +6,4 @@ parameters:
6 test_database_user: travis 6 test_database_user: travis
7 test_database_password: ~ 7 test_database_password: ~
8 test_database_path: ~ 8 test_database_path: ~
9 test_database_charset: utf8
diff --git a/app/config/tests/parameters_test.sqlite.yml b/app/config/tests/parameters_test.sqlite.yml
index 1952e3a6..b8a5f41a 100644
--- a/app/config/tests/parameters_test.sqlite.yml
+++ b/app/config/tests/parameters_test.sqlite.yml
@@ -6,3 +6,4 @@ parameters:
6 test_database_user: ~ 6 test_database_user: ~
7 test_database_password: ~ 7 test_database_password: ~
8 test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite" 8 test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
9 test_database_charset: utf8