From 4ea47eafab9d9aca4f8d24bd006d3a2a916594a9 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Fri, 30 Aug 2019 22:11:12 +0200
Subject: [PATCH] Move Neo4j configuration in configmap

I think it's beneficial to have these settings in a central location.
That way, we're not running into the danger of overwriting the
`nitro-deployment` by accident with a `kubectl apply -f ...`.
---
 deployment/human-connection/deployment-neo4j.yaml     | 11 -----------
 .../templates/configmap.template.yaml                 |  5 +++++
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/deployment/human-connection/deployment-neo4j.yaml b/deployment/human-connection/deployment-neo4j.yaml
index 297f4b551..593f87d2b 100644
--- a/deployment/human-connection/deployment-neo4j.yaml
+++ b/deployment/human-connection/deployment-neo4j.yaml
@@ -30,17 +30,6 @@
               memory: "1G"
             limits:
               memory: "2G"
-          env:
-          - name: NEO4J_apoc_import_file_enabled
-            value: "true"
-          - name: NEO4J_dbms_memory_pagecache_size
-            value: "490M"
-          - name: NEO4J_dbms_memory_heap_max__size
-            value: "500M"
-          - name: NEO4J_dbms_memory_heap_initial__size
-            value: "500M"
-          - name: NEO4J_dbms_security_procedures_unrestricted
-            value: "algo.*,apoc.*"
           envFrom:
           - configMapRef:
               name: configmap
diff --git a/deployment/human-connection/templates/configmap.template.yaml b/deployment/human-connection/templates/configmap.template.yaml
index 1bd227af0..07c0bb53f 100644
--- a/deployment/human-connection/templates/configmap.template.yaml
+++ b/deployment/human-connection/templates/configmap.template.yaml
@@ -9,6 +9,11 @@
     NEO4J_URI: "bolt://nitro-neo4j.human-connection:7687"
     NEO4J_AUTH: "none"
     CLIENT_URI: "https://nitro-staging.human-connection.org"
+    NEO4J_apoc_import_file_enabled: "true"
+    NEO4J_dbms_memory_pagecache_size: "490M"
+    NEO4J_dbms_memory_heap_max__size: "500M"
+    NEO4J_dbms_memory_heap_initial__size: "500M"
+    NEO4J_dbms_security_procedures_unrestricted: "algo.*,apoc.*"
     SENTRY_DSN_WEBAPP: ""
     SENTRY_DSN_BACKEND: ""
     COMMIT: ""