From 3934e68309295e57324c4f7c5ae16e785fefd3c7 Mon Sep 17 00:00:00 2001
From: Mike Iannacone <iannaconemd@ornl.gov>
Date: Tue, 18 Apr 2017 17:47:49 -0400
Subject: [PATCH] minor fixes to configuration and env vars

---
 .../roles/stucco.rt/templates/supervisor/stucco-rt.conf       | 4 ++--
 provisioning/roles/stucco.ui/templates/config/dev_config.json | 2 +-
 .../templates/supervisor/stucco-db-rest-service.conf          | 2 +-
 provisioning/site.yml                                         | 1 +
 scripts/base.sh                                               | 3 ++-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/provisioning/roles/stucco.rt/templates/supervisor/stucco-rt.conf b/provisioning/roles/stucco.rt/templates/supervisor/stucco-rt.conf
index 57ff3c1..67299c3 100644
--- a/provisioning/roles/stucco.rt/templates/supervisor/stucco-rt.conf
+++ b/provisioning/roles/stucco.rt/templates/supervisor/stucco-rt.conf
@@ -11,7 +11,7 @@ autorestart=unexpected
 exitcodes=0
 priority=600
 startretries=10
-environment=STUCCO_DB_TYPE=POSTGRESQL,STUCCO_DB_CONFIG="{{ stucco_dir }}/rt/graph-db-connection/config/postgresql.yml",STUCCO_DB_INDEX_CONFIG=""
+environment=STUCCO_DB_TYPE=POSTGRESQL,STUCCO_DB_CONFIG="{{ stucco_dir }}/rt/graph-db-connection/config/postgresql.yml",SITU_DB_CONFIG="{{ stucco_dir }}/rt/graph-db-connection/config/elasticsearch.yml",STUCCO_DB_INDEX_CONFIG=""
 
 [program:rt-structured]
 command=java -jar streaming-processor/target/rt-structured.jar
@@ -23,7 +23,7 @@ autorestart=unexpected
 exitcodes=0
 priority=600
 startretries=10
-environment=STUCCO_DB_TYPE=POSTGRESQL,STUCCO_DB_CONFIG="{{ stucco_dir }}/rt/graph-db-connection/config/postgresql.yml",STUCCO_DB_INDEX_CONFIG=""
+environment=STUCCO_DB_TYPE=POSTGRESQL,STUCCO_DB_CONFIG="{{ stucco_dir }}/rt/graph-db-connection/config/postgresql.yml",SITU_DB_CONFIG="{{ stucco_dir }}/rt/graph-db-connection/config/elasticsearch.yml",STUCCO_DB_INDEX_CONFIG=""
 
 [group:stucco-rt]
 programs=rt-unstructured,rt-structured
diff --git a/provisioning/roles/stucco.ui/templates/config/dev_config.json b/provisioning/roles/stucco.ui/templates/config/dev_config.json
index 371ef3e..3445c21 100644
--- a/provisioning/roles/stucco.ui/templates/config/dev_config.json
+++ b/provisioning/roles/stucco.ui/templates/config/dev_config.json
@@ -15,7 +15,7 @@
   "graphServer": {
     "graphHost": "{{ stucco_graph_db_connection_service_host }}",
     "graphPort": "{{ stucco_graph_db_connection_service_port }}",
-    "graphRootPath": "api", 
+    "graphRootPath": "api",
     "graphName": "",
     "isRexster": false
   },
diff --git a/provisioning/roles/stucco.ui/templates/supervisor/stucco-db-rest-service.conf b/provisioning/roles/stucco.ui/templates/supervisor/stucco-db-rest-service.conf
index b008947..0703325 100644
--- a/provisioning/roles/stucco.ui/templates/supervisor/stucco-db-rest-service.conf
+++ b/provisioning/roles/stucco.ui/templates/supervisor/stucco-db-rest-service.conf
@@ -10,4 +10,4 @@ autostart=true
 autorestart=true
 priority=500
 startretries=10
-environment=STUCCO_DB_TYPE=POSTGRESQL,STUCCO_DB_CONFIG="{{ stucco_dir }}/rt/graph-db-connection/config/postgresql.yml",STUCCO_DB_INDEX_CONFIG=""
+environment=STUCCO_DB_TYPE=POSTGRESQL,STUCCO_DB_CONFIG="{{ stucco_dir }}/rt/graph-db-connection/config/postgresql.yml",SITU_DB_CONFIG="{{ stucco_dir }}/rt/graph-db-connection/config/elasticsearch.yml",STUCCO_DB_INDEX_CONFIG="",STUCCO_UI_CONFIG="{{ stucco_dir }}/ui/dev_config.json"
diff --git a/provisioning/site.yml b/provisioning/site.yml
index 8fb49fe..b9c248a 100644
--- a/provisioning/site.yml
+++ b/provisioning/site.yml
@@ -77,5 +77,6 @@
   environment:
     STUCCO_DB_TYPE: "POSTGRESQL"
     STUCCO_DB_CONFIG: "{{ stucco_dir }}/graph-db-connection-service/graph-db-connection/config/postgresql.yml"
+    SITU_DB_CONFIG: "{{ stucco_dir }}/graph-db-connection-service/graph-db-connection/config/elasticsearch.yml"
     STUCCO_DB_INDEX_CONFIG:
     STUCCO_UI_CONFIG: "{{ stucco_dir }}/ui/dev_config.json"
diff --git a/scripts/base.sh b/scripts/base.sh
index dcf4b70..5246db9 100644
--- a/scripts/base.sh
+++ b/scripts/base.sh
@@ -15,6 +15,7 @@ echo 'Welcome to your Stucco virtual machine.' > /etc/motd
 # Set environment variables that ansible roles will need
 echo 'STUCCO_DB_TYPE=POSTGRESQL' >> /etc/environment
 echo 'STUCCO_DB_CONFIG="/home/stucco/rt/graph-db-connection/config/postgresql.yml"' >> /etc/environment
+echo 'SITU_DB_CONFIG="/home/stucco/rt/graph-db-connection/config/elasticsearch.yml"' >> /etc/environment
 echo 'STUCCO_DB_INDEX_CONFIG=""' >> /etc/environment
 echo 'STUCCO_UI_CONFIG="/home/stucco/ui/dev_config.json"' >> /etc/environment
-#TODO: check if they were set previously
\ No newline at end of file
+#TODO: check if they were set previously