From b852a54615cbaa9bc3ccf323b4fd2ba5dbb2c96b Mon Sep 17 00:00:00 2001
From: Xavier Coureau <xavier@pandawan-technology.com>
Date: Sun, 22 Oct 2017 21:29:47 -0400
Subject: [PATCH 1/2] Added Neo4j default configuration

Casted port as string

Removed "aliases" block

Typo

Fixes directory structure

Adds port casting

Changes port to integer

Revert "Changes port to integer"

This reverts commit 3cd799f1f81d11e48a390dbb3145a363511276e5.

Force port to be an integer

Revert "Force port to be an integer"

This reverts commit ba46c410a93ce6d9cb1bd9bc81462cf947ea2e25.
---
 neo4j/neo4j-bundle/0.3/config/packages/neo4j.yaml |  8 ++++++++
 neo4j/neo4j-bundle/0.3/manifest.json              | 15 +++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 neo4j/neo4j-bundle/0.3/config/packages/neo4j.yaml
 create mode 100644 neo4j/neo4j-bundle/0.3/manifest.json

diff --git a/neo4j/neo4j-bundle/0.3/config/packages/neo4j.yaml b/neo4j/neo4j-bundle/0.3/config/packages/neo4j.yaml
new file mode 100644
index 00000000..9fc4f203
--- /dev/null
+++ b/neo4j/neo4j-bundle/0.3/config/packages/neo4j.yaml
@@ -0,0 +1,8 @@
+neo4j:
+    connections:
+        default:
+            scheme: "%env(NEO4J_DEFAULT_CONNECTION_SCHEME)%"
+            host: "%env(NEO4J_DEFAULT_CONNECTION_HOST)%"
+            port: "%env(int:NEO4J_DEFAULT_CONNECTION_PORT)%"
+            username: "%env(NEO4J_DEFAULT_CONNECTION_USERNAME)%"
+            password: "%env(NEO4J_DEFAULT_CONNECTION_PASSWORD)%"
diff --git a/neo4j/neo4j-bundle/0.3/manifest.json b/neo4j/neo4j-bundle/0.3/manifest.json
new file mode 100644
index 00000000..e10bbe44
--- /dev/null
+++ b/neo4j/neo4j-bundle/0.3/manifest.json
@@ -0,0 +1,15 @@
+{
+    "bundles": {
+        "Neo4j\\Neo4jBundle\\Neo4jBundle": ["all"]
+    },
+    "copy-from-recipe": {
+        "config/": "%CONFIG_DIR%/"
+    },
+    "env": {
+        "NEO4J_DEFAULT_CONNECTION_SCHEME": "bolt",
+        "NEO4J_DEFAULT_CONNECTION_HOST": "localhost",
+        "NEO4J_DEFAULT_CONNECTION_PORT": "7687",
+        "NEO4J_DEFAULT_CONNECTION_USERNAME": "neo4j",
+        "NEO4J_DEFAULT_CONNECTION_PASSWORD": "neo4j"
+    }
+}

From fc2eff12857128d4cbfcd3f4b8d41f280ba829bf Mon Sep 17 00:00:00 2001
From: Nyholm <tobias.nyholm@gmail.com>
Date: Tue, 25 Dec 2018 13:58:43 +0100
Subject: [PATCH 2/2] Use DSN

---
 neo4j/neo4j-bundle/0.3/config/packages/neo4j.yaml |  8 --------
 neo4j/neo4j-bundle/0.3/manifest.json              | 15 ---------------
 neo4j/neo4j-bundle/0.4/config/packages/neo4j.yaml |  4 ++++
 neo4j/neo4j-bundle/0.4/manifest.json              | 11 +++++++++++
 4 files changed, 15 insertions(+), 23 deletions(-)
 delete mode 100644 neo4j/neo4j-bundle/0.3/config/packages/neo4j.yaml
 delete mode 100644 neo4j/neo4j-bundle/0.3/manifest.json
 create mode 100644 neo4j/neo4j-bundle/0.4/config/packages/neo4j.yaml
 create mode 100644 neo4j/neo4j-bundle/0.4/manifest.json

diff --git a/neo4j/neo4j-bundle/0.3/config/packages/neo4j.yaml b/neo4j/neo4j-bundle/0.3/config/packages/neo4j.yaml
deleted file mode 100644
index 9fc4f203..00000000
--- a/neo4j/neo4j-bundle/0.3/config/packages/neo4j.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-neo4j:
-    connections:
-        default:
-            scheme: "%env(NEO4J_DEFAULT_CONNECTION_SCHEME)%"
-            host: "%env(NEO4J_DEFAULT_CONNECTION_HOST)%"
-            port: "%env(int:NEO4J_DEFAULT_CONNECTION_PORT)%"
-            username: "%env(NEO4J_DEFAULT_CONNECTION_USERNAME)%"
-            password: "%env(NEO4J_DEFAULT_CONNECTION_PASSWORD)%"
diff --git a/neo4j/neo4j-bundle/0.3/manifest.json b/neo4j/neo4j-bundle/0.3/manifest.json
deleted file mode 100644
index e10bbe44..00000000
--- a/neo4j/neo4j-bundle/0.3/manifest.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "bundles": {
-        "Neo4j\\Neo4jBundle\\Neo4jBundle": ["all"]
-    },
-    "copy-from-recipe": {
-        "config/": "%CONFIG_DIR%/"
-    },
-    "env": {
-        "NEO4J_DEFAULT_CONNECTION_SCHEME": "bolt",
-        "NEO4J_DEFAULT_CONNECTION_HOST": "localhost",
-        "NEO4J_DEFAULT_CONNECTION_PORT": "7687",
-        "NEO4J_DEFAULT_CONNECTION_USERNAME": "neo4j",
-        "NEO4J_DEFAULT_CONNECTION_PASSWORD": "neo4j"
-    }
-}
diff --git a/neo4j/neo4j-bundle/0.4/config/packages/neo4j.yaml b/neo4j/neo4j-bundle/0.4/config/packages/neo4j.yaml
new file mode 100644
index 00000000..e903128b
--- /dev/null
+++ b/neo4j/neo4j-bundle/0.4/config/packages/neo4j.yaml
@@ -0,0 +1,4 @@
+neo4j:
+    connections:
+        default:
+            dsn: "%env(NEO4J_DEFAULT_CONNECTION)%"
diff --git a/neo4j/neo4j-bundle/0.4/manifest.json b/neo4j/neo4j-bundle/0.4/manifest.json
new file mode 100644
index 00000000..1c2c5629
--- /dev/null
+++ b/neo4j/neo4j-bundle/0.4/manifest.json
@@ -0,0 +1,11 @@
+{
+    "bundles": {
+        "Neo4j\\Neo4jBundle\\Neo4jBundle": ["all"]
+    },
+    "copy-from-recipe": {
+        "config/": "%CONFIG_DIR%/"
+    },
+    "env": {
+        "NEO4J_DEFAULT_CONNECTION_DSN": "bolt://foo:bar@localhost:7687"
+    }
+}