aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/AppKernel.php1
-rw-r--r--app/config/config.yml25
-rw-r--r--app/config/parameters.yml.dist12
3 files changed, 38 insertions, 0 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php
index 96e45da8..52f85558 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -38,6 +38,7 @@ class AppKernel extends Kernel
38 new Wallabag\UserBundle\WallabagUserBundle(), 38 new Wallabag\UserBundle\WallabagUserBundle(),
39 new Wallabag\ImportBundle\WallabagImportBundle(), 39 new Wallabag\ImportBundle\WallabagImportBundle(),
40 new Wallabag\AnnotationBundle\WallabagAnnotationBundle(), 40 new Wallabag\AnnotationBundle\WallabagAnnotationBundle(),
41 new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
41 ]; 42 ];
42 43
43 if (in_array($this->getEnvironment(), ['dev', 'test'], true)) { 44 if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
diff --git a/app/config/config.yml b/app/config/config.yml
index 31bd8a8c..ef5ae0aa 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -215,3 +215,28 @@ lexik_maintenance:
215 response: 215 response:
216 code: 503 216 code: 503
217 status: "wallabag Service Temporarily Unavailable" 217 status: "wallabag Service Temporarily Unavailable"
218
219old_sound_rabbit_mq:
220 connections:
221 default:
222 host: %rabbitmq_host%
223 port: %rabbitmq_port%
224 user: %rabbitmq_user%
225 password: %rabbitmq_password%
226 vhost: /
227 lazy: false
228 producers:
229 wallabag:
230 connection: default
231 exchange_options:
232 name: 'wallabag_exchange'
233 type: topic
234 consumers:
235 entries:
236 connection: default
237 exchange_options:
238 name: 'wallabag_exchange'
239 type: topic
240 queue_options:
241 name: 'wallabag_queue'
242 callback: wallabag_import.consumer.entry
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index d092e139..e925b412 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -38,3 +38,15 @@ parameters:
38 fosuser_confirmation: true 38 fosuser_confirmation: true
39 39
40 from_email: no-reply@wallabag.org 40 from_email: no-reply@wallabag.org
41
42 rss_limit: 50
43
44 # pocket import
45 pocket_consumer_key: xxxxxxxx
46
47 # RabbitMQ processing
48 rabbitmq: false
49 rabbitmq_host: localhost
50 rabbitmq_port: 5672
51 rabbitmq_user: guest
52 rabbitmq_password: guest