From 95f13479558d37f372c9a751d608c37087fc2666 Mon Sep 17 00:00:00 2001
From: Maksim Kotlyar <kotlyar.maksim@gmail.com>
Date: Mon, 15 May 2017 15:40:55 +0300
Subject: [PATCH] upd

---
 enqueue/amqp-ext/0.4/etc/packages/enqueue_amqp.yaml       | 7 -------
 enqueue/amqp-ext/0.4/manifest.json                        | 6 +-----
 enqueue/enqueue-bundle/0.4/etc/packages/enqueue.yaml      | 4 ++++
 enqueue/enqueue-bundle/0.4/etc/packages/test/enqueue.yaml | 3 +--
 enqueue/enqueue-bundle/0.4/manifest.json                  | 3 +++
 enqueue/fs/0.4/etc/packages/enqueue_fs.yaml               | 4 ----
 enqueue/fs/0.4/manifest.json                              | 6 +-----
 enqueue/fs/0.4/var/enqueue/.gitkeep                       | 0
 8 files changed, 10 insertions(+), 23 deletions(-)
 delete mode 100644 enqueue/amqp-ext/0.4/etc/packages/enqueue_amqp.yaml
 create mode 100644 enqueue/enqueue-bundle/0.4/etc/packages/enqueue.yaml
 delete mode 100644 enqueue/fs/0.4/etc/packages/enqueue_fs.yaml
 delete mode 100644 enqueue/fs/0.4/var/enqueue/.gitkeep

diff --git a/enqueue/amqp-ext/0.4/etc/packages/enqueue_amqp.yaml b/enqueue/amqp-ext/0.4/etc/packages/enqueue_amqp.yaml
deleted file mode 100644
index e98e17b7..00000000
--- a/enqueue/amqp-ext/0.4/etc/packages/enqueue_amqp.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-enqueue:
-    transport:
-        default: 'amqp'
-
-        # If you use RabbitMQ broker rename "amqp" with "rabbitmq_amqp" and the bundle will enable specific features"
-        amqp: '%env(ENQUEUE_AMQP_DSN)%'
-
diff --git a/enqueue/amqp-ext/0.4/manifest.json b/enqueue/amqp-ext/0.4/manifest.json
index ffa2ce06..17bec490 100644
--- a/enqueue/amqp-ext/0.4/manifest.json
+++ b/enqueue/amqp-ext/0.4/manifest.json
@@ -1,9 +1,5 @@
 {
-    "copy-from-recipe": {
-        "etc/": "%ETC_DIR%/"
-    },
     "env": {
-        "ENQUEUE_AMQP_DSN": "amqp://"
+        "ENQUEUE_DSN": "amqp://"
     }
 }
-
diff --git a/enqueue/enqueue-bundle/0.4/etc/packages/enqueue.yaml b/enqueue/enqueue-bundle/0.4/etc/packages/enqueue.yaml
new file mode 100644
index 00000000..3be5e8ac
--- /dev/null
+++ b/enqueue/enqueue-bundle/0.4/etc/packages/enqueue.yaml
@@ -0,0 +1,4 @@
+enqueue:
+    transport:
+        default: '%env(ENQUEUE_DSN)%'
+    client: ~
diff --git a/enqueue/enqueue-bundle/0.4/etc/packages/test/enqueue.yaml b/enqueue/enqueue-bundle/0.4/etc/packages/test/enqueue.yaml
index 16975e86..dfdf970e 100644
--- a/enqueue/enqueue-bundle/0.4/etc/packages/test/enqueue.yaml
+++ b/enqueue/enqueue-bundle/0.4/etc/packages/test/enqueue.yaml
@@ -1,6 +1,5 @@
 enqueue:
     transport:
-        default: 'null'
-        'null': ~
+        default: 'null://'
     client:
         traceable_producer: true
diff --git a/enqueue/enqueue-bundle/0.4/manifest.json b/enqueue/enqueue-bundle/0.4/manifest.json
index 3e9efa66..837b5d3d 100644
--- a/enqueue/enqueue-bundle/0.4/manifest.json
+++ b/enqueue/enqueue-bundle/0.4/manifest.json
@@ -4,5 +4,8 @@
     },
     "copy-from-recipe": {
         "etc/": "%ETC_DIR%/"
+    },
+    "env": {
+        "ENQUEUE_DSN": "null://"
     }
 }
diff --git a/enqueue/fs/0.4/etc/packages/enqueue_fs.yaml b/enqueue/fs/0.4/etc/packages/enqueue_fs.yaml
deleted file mode 100644
index 5c0fcf1c..00000000
--- a/enqueue/fs/0.4/etc/packages/enqueue_fs.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-enqueue:
-    transport:
-        default: 'fs'
-        fs: '%env(ENQUEUE_FS_DSN)%'
diff --git a/enqueue/fs/0.4/manifest.json b/enqueue/fs/0.4/manifest.json
index 1f9b7b67..7a9a5cc0 100644
--- a/enqueue/fs/0.4/manifest.json
+++ b/enqueue/fs/0.4/manifest.json
@@ -1,9 +1,5 @@
 {
-    "copy-from-recipe": {
-        "etc/": "%ETC_DIR%/",
-        "var/": "%VAR_DIR%"
-    },
     "env": {
-        "ENQUEUE_FS_DSN": "%VAR_DIR%/enqueue"
+        "ENQUEUE_DSN": "file:/%VAR_DIR%/enqueue"
     }
 }
diff --git a/enqueue/fs/0.4/var/enqueue/.gitkeep b/enqueue/fs/0.4/var/enqueue/.gitkeep
deleted file mode 100644
index e69de29b..00000000