aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
diff options
context:
space:
mode:
Diffstat (limited to 'app/config')
-rw-r--r--app/config/config.yml22
-rw-r--r--app/config/config_prod.yml3
-rw-r--r--app/config/parameters.yml.dist5
-rw-r--r--app/config/wallabag.yml2
4 files changed, 30 insertions, 2 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 078f277a..bbcc682f 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -370,3 +370,25 @@ jms_serializer:
370sensio_framework_extra: 370sensio_framework_extra:
371 router: 371 router:
372 annotations: false 372 annotations: false
373
374httplug:
375 clients:
376 wallabag_core:
377 factory: 'wallabag_core.http_client_factory'
378 config:
379 defaults:
380 timeout: 10
381 plugins: ['httplug.plugin.logger']
382 wallabag_core.entry.download_images:
383 factory: 'httplug.factory.auto'
384 plugins: ['httplug.plugin.logger']
385 wallabag_import.pocket.client:
386 factory: 'httplug.factory.auto'
387 plugins:
388 - 'httplug.plugin.logger'
389 - header_defaults:
390 headers:
391 'content-type': 'application/json'
392 'X-Accept': 'application/json'
393 discovery:
394 client: false
diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml
index 44e29aac..59d2e9e2 100644
--- a/app/config/config_prod.yml
+++ b/app/config/config_prod.yml
@@ -23,3 +23,6 @@ monolog:
23 level: debug 23 level: debug
24 console: 24 console:
25 type: console 25 type: console
26
27sentry:
28 dsn: "%sentry_dsn%"
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 13e2584f..9948fa46 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -36,7 +36,7 @@ parameters:
36 locale: en 36 locale: en
37 37
38 # A secret key that's used to generate certain security-related tokens 38 # A secret key that's used to generate certain security-related tokens
39 secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv 39 secret: CHANGE_ME_TO_SOMETHING_SECRET_AND_RANDOM
40 40
41 # two factor stuff 41 # two factor stuff
42 twofactor_auth: true 42 twofactor_auth: true
@@ -63,3 +63,6 @@ parameters:
63 redis_port: 6379 63 redis_port: 6379
64 redis_path: null 64 redis_path: null
65 redis_password: null 65 redis_password: null
66
67 # sentry logging
68 sentry_dsn: ~
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
index 96dfacf9..ea1cce12 100644
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@@ -1,5 +1,5 @@
1wallabag_core: 1wallabag_core:
2 version: 2.3.8-dev 2 version: 2.4.0-dev
3 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 3 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
4 languages: 4 languages:
5 en: 'English' 5 en: 'English'