From 03490f91774036389d57c5c1f81156b82fff0e46 Mon Sep 17 00:00:00 2001
From: Alex Byrnes <alex.byrnes@washpost.com>
Date: Thu, 14 Jul 2016 17:36:55 -0400
Subject: [PATCH] rm services, small tweaks

---
 docker/docker-compose.yml   |  6 +++---
 docker/elkhorn/config.json  |  2 +-
 docker/env.conf             | 40 +++++++++++++++++++++++++++++++++++++
 docker/proxy/default.conf   |  7 -------
 docker/proxy/ssl.conf       |  6 ------
 docker/proxy/upstreams.conf |  7 -------
 6 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 3e001db..03da233 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -46,8 +46,8 @@ services:
       - mongodata
 
   elkhorn:
-    image: coralproject/elkhorn
-    #build: elkhorn
+    #image: coralproject/elkhorn
+    build: elkhorn
     restart: always
     environment:
       - "PILLAR_URL=https://${FRONTEND_HOST}/pillar_api"
@@ -67,7 +67,7 @@ services:
     restart: always
     volumes:
       - ./proxy/:/etc/nginx/conf.d/
-      - /etc/ssl/certs/:/etc/ssl/certs/
+      - ./certs/:/etc/ssl/certs/
     links:
       - pillarapp:pillar
       - cayapp:cay
diff --git a/docker/elkhorn/config.json b/docker/elkhorn/config.json
index eb2b39f..e2653e4 100644
--- a/docker/elkhorn/config.json
+++ b/docker/elkhorn/config.json
@@ -1,5 +1,5 @@
 {
- "pillarHost": "<no value>",
+ "pillarHost": "http://localhost:8080",
  "basicAuthorization": "Basic <no value>",
    "s3": {
     "bucket": "<no value>",
diff --git a/docker/env.conf b/docker/env.conf
index cdd8dfe..7c6c53a 100644
--- a/docker/env.conf
+++ b/docker/env.conf
@@ -15,3 +15,43 @@ export S3_BUCKET=xxx
 export AWS_REGION=xxx
 export AWS_ACCESS_KEY_ID=xxx
 export AWS_ACCESS_KEY=xxx
+
+export DBNAME="coral"
+
+export MONGODB_HOST="localhost"
+export RABBITMQ_HOST="localhost"
+export RABBITMQ_DEFAULT_USER=""
+export RABBITMQ_DEFAULT_PASS=""
+export RABBITMQ_PORT="5672"
+
+# PILLAR
+export MONGODB_URL="mongodb://${MONGODB_HOST}:27017/${DBNAME}"
+export AMQP_URL="amqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@${RABBITMQ_HOST}:${RABBITMQ_PORT}/"
+export AMQP_EXCHANGE=PillarMQ
+export PILLAR_ADDRESS=:8080
+export PILLAR_HOME=logs
+export PILLAR_CRON=true
+export PILLAR_CRON_SEARCH="@every 1m"
+export PILLAR_CRON_STATS="@every 100m"
+export XENIA_URL="http://localhost:4000/1.0/exec/"
+export XENIA_QUERY_PARAM="?skip=0&limit=100"
+export XENIA_AUTH="Basic <auth>"
+
+export MONGODB_ADDRESS=${MONGODB_HOST}:27017
+export MONGODB_USERNAME=
+export MONGODB_PASSWORD=
+export MONGODB_PASSWORD_FILE=
+export MONGODB_DATABASE=${DBNAME}
+export MONGODB_SSL=
+
+
+#CAY
+export ENV=Staging
+export PROJECT="Coral Project"
+export DO_AUTH=false
+export GAID=UA-12345678-9
+export AUTH_TOKEN=
+export XENIA_URL="http://localhost:4000"
+export PILLAR_URL="http://localhost:8080"
+
+
diff --git a/docker/proxy/default.conf b/docker/proxy/default.conf
index 96fc7e5..1df206e 100644
--- a/docker/proxy/default.conf
+++ b/docker/proxy/default.conf
@@ -6,10 +6,6 @@ server {
 		proxy_pass http://cay;
 	}
 
-	location "/atoll_demo/" {
-		proxy_pass http://atoll/;
-	}
-
 	location "/cay_demo/" {
 		proxy_pass http://cay/;
 	}
@@ -18,7 +14,4 @@ server {
 		proxy_pass http://pillar/;
 	}
 
-	location "/xenia_demo/" {
-		proxy_pass http://xenia/;
-	}
 }
diff --git a/docker/proxy/ssl.conf b/docker/proxy/ssl.conf
index c75f70e..2471f62 100644
--- a/docker/proxy/ssl.conf
+++ b/docker/proxy/ssl.conf
@@ -15,9 +15,6 @@ server {
 		proxy_pass http://cay;
 	}
 
-	location "/atoll_demo/" {
-		proxy_pass http://atoll/;
-	}
 
 	location "/cay_demo/" {
 		proxy_pass http://cay/;
@@ -27,7 +24,4 @@ server {
 		proxy_pass http://pillar/;
 	}
 
-	location "/xenia_demo/" {
-		proxy_pass http://xenia/;
-	}
 }
diff --git a/docker/proxy/upstreams.conf b/docker/proxy/upstreams.conf
index 4c6e857..baca729 100644
--- a/docker/proxy/upstreams.conf
+++ b/docker/proxy/upstreams.conf
@@ -1,7 +1,3 @@
-upstream atoll {
-    server atoll:8181;
-}
-
 upstream cay {
     server cay:80;
 }
@@ -10,6 +6,3 @@ upstream pillar {
     server pillar:8080;
 }
 
-upstream xenia {
-    server xenia:4000;
-}