diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/config')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/config/parameters.yml | 7 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/config/services.yml | 66 |
2 files changed, 69 insertions, 4 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/config/parameters.yml b/src/Wallabag/CoreBundle/Resources/config/parameters.yml index 6068e84c..4948f385 100644 --- a/src/Wallabag/CoreBundle/Resources/config/parameters.yml +++ b/src/Wallabag/CoreBundle/Resources/config/parameters.yml | |||
@@ -1,8 +1,9 @@ | |||
1 | parameters: | 1 | parameters: |
2 | addons_url: | 2 | addons_url: |
3 | firefox: https://addons.mozilla.org/firefox/addon/wallabag-v2/ | 3 | firefox: https://addons.mozilla.org/firefox/addon/wallabagger/ |
4 | chrome: https://chrome.google.com/webstore/detail/wallabagit/peehlcgckcnclnjlndmoddifcicdnabm | 4 | chrome: https://chrome.google.com/webstore/detail/wallabagger/gbmgphmejlcoihgedabhgjdkcahacjlj |
5 | opera: https://addons.opera.com/en/extensions/details/wallabagger/?display=en | ||
5 | f_droid: https://f-droid.org/app/fr.gaulupeau.apps.InThePoche | 6 | f_droid: https://f-droid.org/app/fr.gaulupeau.apps.InThePoche |
6 | google_play: https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche | 7 | google_play: https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche |
7 | ios: https://itunes.apple.com/app/wallabag/id828331015?mt=8 | 8 | ios: https://itunes.apple.com/app/wallabag-2/id1170800946?mt=8 |
8 | windows: https://www.microsoft.com/store/apps/wallabag/9nblggh11646 | 9 | windows: https://www.microsoft.com/store/apps/wallabag/9nblggh11646 |
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index ed66d2be..fadd5e49 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -30,7 +30,7 @@ services: | |||
30 | - "@doctrine" | 30 | - "@doctrine" |
31 | 31 | ||
32 | wallabag_core.subscriber.table_prefix: | 32 | wallabag_core.subscriber.table_prefix: |
33 | class: Wallabag\CoreBundle\Subscriber\TablePrefixSubscriber | 33 | class: Wallabag\CoreBundle\Event\Subscriber\TablePrefixSubscriber |
34 | arguments: | 34 | arguments: |
35 | - "%database_table_prefix%" | 35 | - "%database_table_prefix%" |
36 | tags: | 36 | tags: |
@@ -41,11 +41,44 @@ services: | |||
41 | arguments: | 41 | arguments: |
42 | - | 42 | - |
43 | error_message: '%wallabag_core.fetching_error_message%' | 43 | error_message: '%wallabag_core.fetching_error_message%' |
44 | - "@wallabag_core.guzzle.http_client" | ||
45 | - "@wallabag_core.graby.config_builder" | ||
44 | calls: | 46 | calls: |
45 | - [ setLogger, [ "@logger" ] ] | 47 | - [ setLogger, [ "@logger" ] ] |
46 | tags: | 48 | tags: |
47 | - { name: monolog.logger, channel: graby } | 49 | - { name: monolog.logger, channel: graby } |
48 | 50 | ||
51 | wallabag_core.graby.config_builder: | ||
52 | class: Graby\SiteConfig\ConfigBuilder | ||
53 | arguments: | ||
54 | - {} | ||
55 | - "@logger" | ||
56 | |||
57 | wallabag_core.guzzle.http_client: | ||
58 | class: GuzzleHttp\ClientInterface | ||
59 | factory: ["@wallabag_core.guzzle.http_client_factory", buildHttpClient] | ||
60 | |||
61 | wallabag_core.guzzle_authenticator.config_builder: | ||
62 | class: Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder | ||
63 | arguments: | ||
64 | - "@wallabag_core.graby.config_builder" | ||
65 | - "%sites_credentials%" | ||
66 | |||
67 | # service alias override | ||
68 | bd_guzzle_site_authenticator.site_config_builder: | ||
69 | alias: wallabag_core.guzzle_authenticator.config_builder | ||
70 | |||
71 | wallabag_core.guzzle.http_client_factory: | ||
72 | class: Wallabag\CoreBundle\Helper\HttpClientFactory | ||
73 | arguments: | ||
74 | - "@bd_guzzle_site_authenticator.authenticator_subscriber" | ||
75 | - "@wallabag_core.guzzle.cookie_jar" | ||
76 | - '@=service(''craue_config'').get(''restricted_access'')' | ||
77 | |||
78 | wallabag_core.guzzle.cookie_jar: | ||
79 | class: GuzzleHttp\Cookie\FileCookieJar | ||
80 | arguments: ["%kernel.cache_dir%/cookiejar.json"] | ||
81 | |||
49 | wallabag_core.content_proxy: | 82 | wallabag_core.content_proxy: |
50 | class: Wallabag\CoreBundle\Helper\ContentProxy | 83 | class: Wallabag\CoreBundle\Helper\ContentProxy |
51 | arguments: | 84 | arguments: |
@@ -53,6 +86,7 @@ services: | |||
53 | - "@wallabag_core.rule_based_tagger" | 86 | - "@wallabag_core.rule_based_tagger" |
54 | - "@wallabag_core.tag_repository" | 87 | - "@wallabag_core.tag_repository" |
55 | - "@logger" | 88 | - "@logger" |
89 | - '%wallabag_core.fetching_error_message%' | ||
56 | 90 | ||
57 | wallabag_core.rule_based_tagger: | 91 | wallabag_core.rule_based_tagger: |
58 | class: Wallabag\CoreBundle\Helper\RuleBasedTagger | 92 | class: Wallabag\CoreBundle\Helper\RuleBasedTagger |
@@ -94,6 +128,7 @@ services: | |||
94 | class: Wallabag\CoreBundle\Helper\Redirect | 128 | class: Wallabag\CoreBundle\Helper\Redirect |
95 | arguments: | 129 | arguments: |
96 | - "@router" | 130 | - "@router" |
131 | - "@security.token_storage" | ||
97 | 132 | ||
98 | wallabag_core.helper.prepare_pager_for_entries: | 133 | wallabag_core.helper.prepare_pager_for_entries: |
99 | class: Wallabag\CoreBundle\Helper\PreparePagerForEntries | 134 | class: Wallabag\CoreBundle\Helper\PreparePagerForEntries |
@@ -109,9 +144,38 @@ services: | |||
109 | host: '%redis_host%' | 144 | host: '%redis_host%' |
110 | port: '%redis_port%' | 145 | port: '%redis_port%' |
111 | path: '%redis_path%' | 146 | path: '%redis_path%' |
147 | password: '%redis_password%' | ||
112 | 148 | ||
113 | wallabag_core.exception_controller: | 149 | wallabag_core.exception_controller: |
114 | class: Wallabag\CoreBundle\Controller\ExceptionController | 150 | class: Wallabag\CoreBundle\Controller\ExceptionController |
115 | arguments: | 151 | arguments: |
116 | - '@twig' | 152 | - '@twig' |
117 | - '%kernel.debug%' | 153 | - '%kernel.debug%' |
154 | |||
155 | wallabag_core.subscriber.sqlite_cascade_delete: | ||
156 | class: Wallabag\CoreBundle\Event\Subscriber\SQLiteCascadeDeleteSubscriber | ||
157 | arguments: | ||
158 | - "@doctrine" | ||
159 | tags: | ||
160 | - { name: doctrine.event_subscriber } | ||
161 | |||
162 | wallabag_core.subscriber.download_images: | ||
163 | class: Wallabag\CoreBundle\Event\Subscriber\DownloadImagesSubscriber | ||
164 | arguments: | ||
165 | - "@doctrine.orm.default_entity_manager" | ||
166 | - "@wallabag_core.entry.download_images" | ||
167 | - '@=service(''craue_config'').get(''download_images_enabled'')' | ||
168 | - "@logger" | ||
169 | tags: | ||
170 | - { name: kernel.event_subscriber } | ||
171 | |||
172 | wallabag_core.entry.download_images: | ||
173 | class: Wallabag\CoreBundle\Helper\DownloadImages | ||
174 | arguments: | ||
175 | - "@wallabag_core.entry.download_images.client" | ||
176 | - "%kernel.root_dir%/../web/assets/images" | ||
177 | - '@=service(''craue_config'').get(''wallabag_url'')' | ||
178 | - "@logger" | ||
179 | |||
180 | wallabag_core.entry.download_images.client: | ||
181 | class: GuzzleHttp\Client | ||