6 files changed, 137 insertions, 19 deletions

diff --git a/app/config/config.yml b/app/config/config.yml
index 2b11937c..b5d82ed9 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -30,7 +30,7 @@ framework:
     assets: ~
 
 wallabag_core:
-    version: 2.0.8
+    version: 2.1.0
     paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     languages:
         en: 'English'
@@ -49,9 +49,13 @@ wallabag_core:
     language: en
     rss_limit: 50
     reading_speed: 1
+    cache_lifetime: 10
+
+wallabag_user:
+    registration_enabled: "%fosuser_registration%"
 
 wallabag_import:
-    allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']
+    allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv']
     resource_dir: "%kernel.root_dir%/../web/uploads/import"
 
 # Twig Configuration
@@ -61,19 +65,6 @@ twig:
     form_themes:
         - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
 
-# Assetic Configuration
-assetic:
-    debug: "%kernel.debug%"
-    use_controller: false
-    bundles:        [ ]
-    #java: /usr/bin/java
-    filters:
-        cssrewrite: ~
-        #closure:
-        #    jar: "%kernel.root_dir%/Resources/java/compiler.jar"
-        #yui_css:
-        #    jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar"
-
 # Doctrine Configuration
 doctrine:
     dbal:
@@ -224,3 +215,106 @@ lexik_maintenance:
     response:
         code: 503
         status: "wallabag Service Temporarily Unavailable"
+
+old_sound_rabbit_mq:
+    connections:
+        default:
+            host:     "%rabbitmq_host%"
+            port:     "%rabbitmq_port%"
+            user:     "%rabbitmq_user%"
+            password: "%rabbitmq_password%"
+            vhost:    /
+            lazy:     true
+    producers:
+        import_pocket:
+            connection: default
+            exchange_options:
+                name: 'wallabag.import.pocket'
+                type: topic
+        import_readability:
+            connection: default
+            exchange_options:
+                name: 'wallabag.import.readability'
+                type: topic
+        import_instapaper:
+            connection: default
+            exchange_options:
+                name: 'wallabag.import.instapaper'
+                type: topic
+        import_wallabag_v1:
+            connection: default
+            exchange_options:
+                name: 'wallabag.import.wallabag_v1'
+                type: topic
+        import_wallabag_v2:
+            connection: default
+            exchange_options:
+                name: 'wallabag.import.wallabag_v2'
+                type: topic
+        import_firefox:
+            connection: default
+            exchange_options:
+                name: 'wallabag.import.firefox'
+                type: topic
+        import_chrome:
+            connection: default
+            exchange_options:
+                name: 'wallabag.import.chrome'
+                type: topic
+    consumers:
+        import_pocket:
+            connection: default
+            exchange_options:
+                name: 'wallabag.import.pocket'
+                type: topic
+            queue_options:
+                name: 'wallabag.import.pocket'
+            callback: wallabag_import.consumer.amqp.pocket
+        import_readability:
+            connection: default
+            exchange_options:
+                name: 'wallabag.import.readability'
+                type: topic
+            queue_options:
+                name: 'wallabag.import.readability'
+            callback: wallabag_import.consumer.amqp.readability
+        import_instapaper:
+            connection: default
+            exchange_options:
+                name: 'wallabag.import.instapaper'
+                type: topic
+            queue_options:
+                name: 'wallabag.import.instapaper'
+            callback: wallabag_import.consumer.amqp.instapaper
+        import_wallabag_v1:
+            connection: default
+            exchange_options:
+                name: 'wallabag.import.wallabag_v1'
+                type: topic
+            queue_options:
+                name: 'wallabag.import.wallabag_v1'
+            callback: wallabag_import.consumer.amqp.wallabag_v1
+        import_wallabag_v2:
+            connection: default
+            exchange_options:
+                name: 'wallabag.import.wallabag_v2'
+                type: topic
+            queue_options:
+                name: 'wallabag.import.wallabag_v2'
+            callback: wallabag_import.consumer.amqp.wallabag_v2
+        import_firefox:
+            connection: default
+            exchange_options:
+                name: 'wallabag.import.firefox'
+                type: topic
+            queue_options:
+                name: 'wallabag.import.firefox'
+            callback: wallabag_import.consumer.amqp.firefox
+        import_chrome:
+            connection: default
+            exchange_options:
+                name: 'wallabag.import.chrome'
+                type: topic
+            queue_options:
+                name: 'wallabag.import.chrome'
+            callback: wallabag_import.consumer.amqp.chrome
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
index 0fa23dbf..3b67d8f6 100644
--- a/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@@ -35,11 +35,16 @@ monolog:
                 VERBOSITY_DEBUG: DEBUG
             channels: [doctrine]
 
-assetic:
-    use_controller: true
-
 swiftmailer:
     # see http://mailcatcher.me/
     transport: smtp
     host: 'localhost'
     port: 1025
+
+# If you want to use cache for queries used in WallabagExtension
+# Uncomment the following lines
+#doctrine:
+#    orm:
+#        metadata_cache_driver: apcu
+#        result_cache_driver: apcu
+#        query_cache_driver: apcu
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index d45839f4..f2e5bec3 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -34,6 +34,19 @@ parameters:
     twofactor_sender: no-reply@wallabag.org
 
     # fosuser stuff
+    fosuser_registration: true
     fosuser_confirmation: true
 
     from_email: no-reply@wallabag.org
+
+    rss_limit: 50
+
+    # RabbitMQ processing
+    rabbitmq_host: localhost
+    rabbitmq_port: 5672
+    rabbitmq_user: guest
+    rabbitmq_password: guest
+
+    # Redis processing
+    redis_host: localhost
+    redis_port: 6379
diff --git a/app/config/parameters_test.yml b/app/config/parameters_test.yml
index 696c95ef..2943b27a 100644
--- a/app/config/parameters_test.yml
+++ b/app/config/parameters_test.yml
@@ -5,4 +5,4 @@ parameters:
     test_database_name: null
     test_database_user: null
     test_database_password: null
-    test_database_path: '%kernel.root_dir%/../data/db/wallabag_testYO.sqlite'
+    test_database_path: '%kernel.root_dir%/../data/db/wallabag_test.sqlite'
diff --git a/app/config/security.yml b/app/config/security.yml
index e24e03df..1f30e58b 100644
--- a/app/config/security.yml
+++ b/app/config/security.yml
@@ -60,6 +60,7 @@ security:
         - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/share, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/settings, roles: ROLE_SUPER_ADMIN }
         - { path: ^/annotations, roles: ROLE_USER }
         - { path: ^/, roles: ROLE_USER }
diff --git a/app/config/services.yml b/app/config/services.yml
index 480408d9..76bbce27 100644
--- a/app/config/services.yml
+++ b/app/config/services.yml
@@ -16,6 +16,11 @@ services:
     wallabag.twig_extension:
         class: Wallabag\CoreBundle\Twig\WallabagExtension
         public: false
+        arguments:
+            - "@wallabag_core.entry_repository"
+            - "@wallabag_core.tag_repository"
+            - "@security.token_storage"
+            - "%wallabag_core.cache_lifetime%"
         tags:
             - { name: twig.extension }