From 15f3969cb88ce5576da368708dad1903828148f0 Mon Sep 17 00:00:00 2001
From: Instrumental <jonathan.gathman@att.com>
Date: Fri, 20 Jul 2018 11:32:41 -0500
Subject: Document AAF Installation

Issue-ID: AAF-292
Change-Id: Ic02bf086454dcd0de306f9e6d9c334fd0f6b21e7
Signed-off-by: Instrumental <jonathan.gathman@att.com>
---
 auth/docker/Dockerfile.config |  1 +
 auth/docker/d.props.init      | 12 ++++++------
 auth/docker/dbounce.sh        |  4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'auth/docker')

diff --git a/auth/docker/Dockerfile.config b/auth/docker/Dockerfile.config
index f3bd6bc9..60e82ad1 100644
--- a/auth/docker/Dockerfile.config
+++ b/auth/docker/Dockerfile.config
@@ -11,6 +11,7 @@ COPY local /opt/app/aaf_config/local
 COPY public /opt/app/aaf_config/public
 COPY logs /opt/app/aaf_config/logs
 COPY bin/service.sh /opt/app/aaf_config/bin/agent.sh
+COPY bin/aaf-cadi-aaf-${VERSION}-full.jar /opt/app/aaf_config/bin/
 
 ENTRYPOINT ["/bin/bash","/opt/app/aaf_config/bin/agent.sh"]
 CMD []
diff --git a/auth/docker/d.props.init b/auth/docker/d.props.init
index 8691591c..b0ba63d8 100644
--- a/auth/docker/d.props.init
+++ b/auth/docker/d.props.init
@@ -6,12 +6,12 @@ VERSION=2.1.2-SNAPSHOT
 CONF_ROOT_DIR=/opt/app/osaaf
 
 # Local Env info
-HOSTNAME=
+HOSTNAME=aaf.osaaf.org
 HOST_IP=
-CASS_HOST=<cass FQDN>:<cass IP>
+CASS_HOST=cass.aaf.osaaf.org:<Cass IP>
 
 # AAF Machine info
-aaf_env=DEV
-aaf_register_as=$HOSTNAME
-cadi_latitude=
-cadi_longitude=
+AAF_ENV=DEV
+AAF_REGISTER_AS=$HOSTNAME
+LATITUDE=
+LONGITUDE=
diff --git a/auth/docker/dbounce.sh b/auth/docker/dbounce.sh
index e6367957..82aedd0c 100644
--- a/auth/docker/dbounce.sh
+++ b/auth/docker/dbounce.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-sh ./dstop.sh "$@"
-sh ./dstart.sh "$@"
+bash ./dstop.sh "$@"
+bash ./dstart.sh "$@"
-- 
cgit 1.2.3-korg