Refine properties for non-root

Issue-ID: AAF-698
Change-Id: I266f0e36842fb506dbb3e412e12eedf64e24418a
Signed-off-by: Instrumental <jonathan.gathman@att.com>
diff --git a/conf/CA/bootstrap.sh b/conf/CA/bootstrap.sh
index bf94678..c6064fb 100644
--- a/conf/CA/bootstrap.sh
+++ b/conf/CA/bootstrap.sh
@@ -32,7 +32,8 @@
 fi
 
 NAME=aaf.bootstrap
-FQDN="${HOSTNAME:=$(hostname -f)}"
+HOSTNAME="${HOSTNAME:=$(hostname -)}"
+FQDN="${aaf_locator_fqdn:=$HOSTNAME}"
 FQI=aaf@aaf.osaaf.org
 SUBJECT="/CN=$FQDN/OU=$FQI`cat subject.aaf`"
 SIGNER_P12=$1