diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/config/config.yml | 22 | ||||
-rw-r--r-- | app/config/parameters.yml.dist | 4 |
2 files changed, 11 insertions, 15 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index ef5ae0aa..fa829637 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -219,24 +219,24 @@ lexik_maintenance: | |||
219 | old_sound_rabbit_mq: | 219 | old_sound_rabbit_mq: |
220 | connections: | 220 | connections: |
221 | default: | 221 | default: |
222 | host: %rabbitmq_host% | 222 | host: "%rabbitmq_host%" |
223 | port: %rabbitmq_port% | 223 | port: "%rabbitmq_port%" |
224 | user: %rabbitmq_user% | 224 | user: "%rabbitmq_user%" |
225 | password: %rabbitmq_password% | 225 | password: "%rabbitmq_password%" |
226 | vhost: / | 226 | vhost: / |
227 | lazy: false | 227 | lazy: true |
228 | producers: | 228 | producers: |
229 | wallabag: | 229 | wallabag_pocket: |
230 | connection: default | 230 | connection: default |
231 | exchange_options: | 231 | exchange_options: |
232 | name: 'wallabag_exchange' | 232 | name: 'wallabag.import.pocket' |
233 | type: topic | 233 | type: topic |
234 | consumers: | 234 | consumers: |
235 | entries: | 235 | wallabag_pocket: |
236 | connection: default | 236 | connection: default |
237 | exchange_options: | 237 | exchange_options: |
238 | name: 'wallabag_exchange' | 238 | name: 'wallabag.import.pocket' |
239 | type: topic | 239 | type: topic |
240 | queue_options: | 240 | queue_options: |
241 | name: 'wallabag_queue' | 241 | name: 'wallabag.import.pocket' |
242 | callback: wallabag_import.consumer.entry | 242 | callback: wallabag_import.consumer.pocket |
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index e925b412..a59dc02c 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
@@ -41,11 +41,7 @@ parameters: | |||
41 | 41 | ||
42 | rss_limit: 50 | 42 | rss_limit: 50 |
43 | 43 | ||
44 | # pocket import | ||
45 | pocket_consumer_key: xxxxxxxx | ||
46 | |||
47 | # RabbitMQ processing | 44 | # RabbitMQ processing |
48 | rabbitmq: false | ||
49 | rabbitmq_host: localhost | 45 | rabbitmq_host: localhost |
50 | rabbitmq_port: 5672 | 46 | rabbitmq_port: 5672 |
51 | rabbitmq_user: guest | 47 | rabbitmq_user: guest |