Fixed a config issue

Author: Karl Stoney

config/hbase-indexer/indices/users.xml renamed to config/lily/indices/users.xml

@@ -1,5 +1,11 @@
 #!/bin/bash
-set -e 
+set -e
+
+if ! hash jq 2>/dev/null; then
+  echo You need JQ installed matey!  Please install it first.
+  exit 1
+fi
+ 
 echo Starting HDFS...
 docker-compose up -d namenode datanode1 datanode2 
 
@@ -18,18 +24,28 @@ docker-compose up -d hue
 echo Creating Users table in HBase...
 docker-compose exec hbase_master /bin/sh -c "echo \"create 'User', { NAME => 'cf', REPLICATION_SCOPE => '1' }\" | hbase shell"
 
-echo Creating Templates in Hue...
-API="http://127.0.0.1:8082/nifi-api"
-PROCESS_GROUP=$(curl --silent $API/flow/process-groups/root | jq .processGroupFlow.id)
-PROCESS_GROUP=$(echo $PROCESS_GROUP | tr -d '"')
+export WEB="http://127.0.0.1:8082/nifi"
+export API="http://127.0.0.1:8082/nifi-api"
+echo Waiting for NiFi to come up...
+until $(curl --output /dev/null --silent --head --fail $WEB); do
+  printf '.'
+  sleep 2
+done
 
-curl -iv -F template=@config/hue/users.xml $API/process-groups/$PROCESS_GROUP/templates/upload  
+echo Creating Templates in NiFi...
+export PROCESS_GROUP=$(curl --silent $API/flow/process-groups/root | jq .processGroupFlow.id)
+export PROCESS_GROUP=$(echo $PROCESS_GROUP | tr -d '"')
+echo Process group: $PROCESS_GROUP
 
-TEMPLATE_ID=$(curl --silent $API/flow/templates | jq .templates | jq '.[]'.id)
-TEMPLATE_ID=$(echo $TEMPLATE_ID | tr -d '"')
+curl -iv -F template=@config/nifi/users.xml $API/process-groups/$PROCESS_GROUP/templates/upload > /dev/null
+ 
+export TEMPLATE_ID=$(curl --silent $API/flow/templates | jq .templates | jq '.[]'.id)
+export TEMPLATE_ID=$(echo $TEMPLATE_ID | tr -d '"')
+echo Template id: $TEMPLATE_ID
 
-PAYLOAD="{\"templateId\":\"$TEMPLATE_ID\",\"originX\":365,\"originY\":-21}"
+export PAYLOAD="{\"templateId\":\"$TEMPLATE_ID\",\"originX\":365,\"originY\":-21}"
 
-curl -kH "Content-Type: application/json" -X POST -d $PAYLOAD $API/process-groups/$PROCESS_GROUP/template-instance
+curl -kH "Content-Type: application/json" -X POST -d $PAYLOAD $API/process-groups/$PROCESS_GROUP/template-instance > /dev/null
 
-open "http://127.0.0.1:8082/nifi"
+echo Opening NiFi...
+open $WEB 

config/hue/users.xml renamed to config/nifi/users.xml

@@ -154,7 +154,7 @@ services:
       - HBASE_CONF_ROOTDIR=hdfs://namenode:8020/hbase
       - INDEX_COLLECTION_users=collection1
     volumes:
-      - ./conf/hbase-indexer:/data
+      - ./config/:/data
     depends_on:
       - hbase
       - hbase_master