aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
diff options
context:
space:
mode:
Diffstat (limited to 'app/config')
-rw-r--r--app/config/config.yml73
-rw-r--r--app/config/config_test.yml2
-rw-r--r--app/config/parameters.yml.dist18
-rw-r--r--app/config/parameters_test.yml1
-rw-r--r--app/config/routing.yml3
-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, 82 insertions, 27 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 3d9067d1..6b1ed056 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -78,7 +78,7 @@ doctrine:
78 dbname: "%database_name%" 78 dbname: "%database_name%"
79 user: "%database_user%" 79 user: "%database_user%"
80 password: "%database_password%" 80 password: "%database_password%"
81 charset: UTF8 81 charset: "%database_charset%"
82 path: "%database_path%" 82 path: "%database_path%"
83 unix_socket: "%database_socket%" 83 unix_socket: "%database_socket%"
84 server_version: 5.6 84 server_version: 5.6
@@ -115,12 +115,26 @@ swiftmailer:
115fos_rest: 115fos_rest:
116 param_fetcher_listener: true 116 param_fetcher_listener: true
117 body_listener: true 117 body_listener: true
118 format_listener: true
119 view: 118 view:
119 mime_types:
120 csv:
121 - 'text/csv'
122 - 'text/plain'
123 pdf:
124 - 'application/pdf'
125 epub:
126 - 'application/epub+zip'
127 mobi:
128 - 'application/x-mobipocket-ebook'
120 view_response_listener: 'force' 129 view_response_listener: 'force'
121 formats: 130 formats:
122 xml: true 131 xml: true
123 json : true 132 json: true
133 txt: true
134 csv: true
135 pdf: true
136 epub: true
137 mobi: true
124 templating_formats: 138 templating_formats:
125 html: true 139 html: true
126 force_redirects: 140 force_redirects:
@@ -129,10 +143,21 @@ fos_rest:
129 default_engine: twig 143 default_engine: twig
130 routing_loader: 144 routing_loader:
131 default_format: json 145 default_format: json
146 format_listener:
147 enabled: true
148 rules:
149 - { path: "^/api/entries/([0-9]+)/export.(.*)", priorities: ['epub', 'mobi', 'pdf', 'txt', 'csv'], fallback_format: false, prefer_extension: false }
150 - { path: "^/api", priorities: ['json', 'xml'], fallback_format: false, prefer_extension: false }
151 - { path: "^/annotations", priorities: ['json', 'xml'], fallback_format: false, prefer_extension: false }
152 # for an unknown reason, EACH REQUEST goes to FOS\RestBundle\EventListener\FormatListener
153 # so we need to add custom rule for custom api export but also for all other routes of the application...
154 - { path: '^/', priorities: ['text/html', '*/*'], fallback_format: html, prefer_extension: false }
132 155
133nelmio_api_doc: 156nelmio_api_doc:
134 sandbox: 157 sandbox:
135 enabled: false 158 enabled: false
159 cache:
160 enabled: true
136 name: wallabag API documentation 161 name: wallabag API documentation
137 162
138nelmio_cors: 163nelmio_cors:
@@ -185,6 +210,7 @@ fos_user:
185 from_email: 210 from_email:
186 address: "%from_email%" 211 address: "%from_email%"
187 sender_name: wallabag 212 sender_name: wallabag
213
188fos_oauth_server: 214fos_oauth_server:
189 db_driver: orm 215 db_driver: orm
190 client_class: Wallabag\ApiBundle\Entity\Client 216 client_class: Wallabag\ApiBundle\Entity\Client
@@ -192,10 +218,10 @@ fos_oauth_server:
192 refresh_token_class: Wallabag\ApiBundle\Entity\RefreshToken 218 refresh_token_class: Wallabag\ApiBundle\Entity\RefreshToken
193 auth_code_class: Wallabag\ApiBundle\Entity\AuthCode 219 auth_code_class: Wallabag\ApiBundle\Entity\AuthCode
194 service: 220 service:
195 user_provider: fos_user.user_manager 221 user_provider: fos_user.user_provider.username_email
196 options: 222 options:
197 refresh_token_lifetime: 1209600 223 refresh_token_lifetime: 1209600
198 224
199scheb_two_factor: 225scheb_two_factor:
200 trusted_computer: 226 trusted_computer:
201 enabled: true 227 enabled: true
@@ -213,16 +239,6 @@ kphoen_rulerz:
213 executors: 239 executors:
214 doctrine: true 240 doctrine: true
215 241
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: 242old_sound_rabbit_mq:
227 connections: 243 connections:
228 default: 244 default:
@@ -243,6 +259,11 @@ old_sound_rabbit_mq:
243 exchange_options: 259 exchange_options:
244 name: 'wallabag.import.readability' 260 name: 'wallabag.import.readability'
245 type: topic 261 type: topic
262 import_pinboard:
263 connection: default
264 exchange_options:
265 name: 'wallabag.import.pinboard'
266 type: topic
246 import_instapaper: 267 import_instapaper:
247 connection: default 268 connection: default
248 exchange_options: 269 exchange_options:
@@ -293,6 +314,14 @@ old_sound_rabbit_mq:
293 queue_options: 314 queue_options:
294 name: 'wallabag.import.instapaper' 315 name: 'wallabag.import.instapaper'
295 callback: wallabag_import.consumer.amqp.instapaper 316 callback: wallabag_import.consumer.amqp.instapaper
317 import_pinboard:
318 connection: default
319 exchange_options:
320 name: 'wallabag.import.pinboard'
321 type: topic
322 queue_options:
323 name: 'wallabag.import.pinboard'
324 callback: wallabag_import.consumer.amqp.pinboard
296 import_wallabag_v1: 325 import_wallabag_v1:
297 connection: default 326 connection: default
298 exchange_options: 327 exchange_options:
@@ -325,3 +354,17 @@ old_sound_rabbit_mq:
325 queue_options: 354 queue_options:
326 name: 'wallabag.import.chrome' 355 name: 'wallabag.import.chrome'
327 callback: wallabag_import.consumer.amqp.chrome 356 callback: wallabag_import.consumer.amqp.chrome
357
358fos_js_routing:
359 routes_to_expose:
360 - homepage
361 - starred
362 - archive
363 - all
364 - tag
365 - config
366 - import
367 - developer
368 - howto
369 - fos_user_security_logout
370 - 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..a4dc0bde 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
@@ -53,3 +55,7 @@ parameters:
53 redis_host: localhost 55 redis_host: localhost
54 redis_port: 6379 56 redis_port: 6379
55 redis_path: null 57 redis_path: null
58 redis_password: null
59
60 # sites credentials
61 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..eedf51d5 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -52,3 +52,6 @@ craue_config_settings_modify:
52 path: /settings 52 path: /settings
53 defaults: 53 defaults:
54 _controller: CraueConfigBundle:Settings:modify 54 _controller: CraueConfigBundle:Settings:modify
55
56fos_js_routing:
57 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