diff options
| author |   Instrumental <jonathan.gathman@att.com> | 2018-09-25 07:56:54 -0500 |
|---|---|---|
| committer | Instrumental <jonathan.gathman@att.com> | 2018-09-25 07:56:59 -0500 |
| commit | 54883b4545dc32a5e4c7fbe0a49ef5b89a615435 (patch) | |
| tree | 682ea9f5dac9188fe80bddde9be4f32b0b86f6c9 | |
| parent | bc299c00e5a86732c5a063a1d7c7bccf1d4ab21b (diff) | |
HOSTNAME env for Install
Issue-ID: AAF-517
Change-Id: Ie1735b32912d300e6be3aba3ec13cd2e12e4bfc0
Signed-off-by: Instrumental <jonathan.gathman@att.com>
| -rw-r--r-- | auth/docker/aaf.sh | 1 | ||||
| -rw-r--r-- | conf/CA/bootstrap.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/auth/docker/aaf.sh b/auth/docker/aaf.sh index 1290ea78..3fc41496 100644 --- a/auth/docker/aaf.sh +++ b/auth/docker/aaf.sh @@ -6,6 +6,7 @@ function run_it() { --mount 'type=volume,src=aaf_config,dst='$CONF_ROOT_DIR',volume-driver=local' \ --add-host="$HOSTNAME:$HOST_IP" \ --add-host="aaf.osaaf.org:$HOST_IP" \ + --env HOSTNAME=${HOSTNAME} \ --env AAF_ENV=${AAF_ENV} \ --env AAF_REGISTER_AS=${AAF_REGISTER_AS} \ --env LATITUDE=${LATITUDE} \ diff --git a/conf/CA/bootstrap.sh b/conf/CA/bootstrap.sh index 7d89b35c..10290075 100644 --- a/conf/CA/bootstrap.sh +++ b/conf/CA/bootstrap.sh @@ -13,7 +13,7 @@ if [ ! -e ./serial ]; then fi NAME=aaf.bootstrap -FQDN=$(hostname -f) +FQDN="${HOSTNAME:=$(hostname -f)}" FQI=aaf@aaf.osaaf.org SUBJECT="/CN=$FQDN/OU=$FQI`cat subject.aaf`" SIGNER_P12=$1 |