aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-11-08 14:19:40 +0100
committerGitHub <noreply@github.com>2016-11-08 14:19:40 +0100
commit41c2178685a93999a48842ab79b08091c0345c59 (patch)
treeac502376a00f25d46c86cd27a9a18f61ea30146d /app
parent01ad4d6a89f52bdbf21ab2b14e3fe9291f2a9290 (diff)
parent82f9a5207888e0f1abbb5dda0e5f01c3589769b6 (diff)
downloadwallabag-41c2178685a93999a48842ab79b08091c0345c59.tar.gz
wallabag-41c2178685a93999a48842ab79b08091c0345c59.tar.zst
wallabag-41c2178685a93999a48842ab79b08091c0345c59.zip
Merge pull request #2548 from wallabag/pinboard
Add Pinboard import
Diffstat (limited to 'app')
-rw-r--r--app/config/config.yml13
1 files changed, 13 insertions, 0 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 0dc5809a..168634cf 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -256,6 +256,11 @@ old_sound_rabbit_mq:
256 exchange_options: 256 exchange_options:
257 name: 'wallabag.import.readability' 257 name: 'wallabag.import.readability'
258 type: topic 258 type: topic
259 import_pinboard:
260 connection: default
261 exchange_options:
262 name: 'wallabag.import.pinboard'
263 type: topic
259 import_instapaper: 264 import_instapaper:
260 connection: default 265 connection: default
261 exchange_options: 266 exchange_options:
@@ -306,6 +311,14 @@ old_sound_rabbit_mq:
306 queue_options: 311 queue_options:
307 name: 'wallabag.import.instapaper' 312 name: 'wallabag.import.instapaper'
308 callback: wallabag_import.consumer.amqp.instapaper 313 callback: wallabag_import.consumer.amqp.instapaper
314 import_pinboard:
315 connection: default
316 exchange_options:
317 name: 'wallabag.import.pinboard'
318 type: topic
319 queue_options:
320 name: 'wallabag.import.pinboard'
321 callback: wallabag_import.consumer.amqp.pinboard
309 import_wallabag_v1: 322 import_wallabag_v1:
310 connection: default 323 connection: default
311 exchange_options: 324 exchange_options: