X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=conf%2FCA%2Fbootstrap.sh;h=6ccc6bfa425a68b7009a69c2dda059dd2d30aa35;hb=dd097a4b411cd78ced737548a43e019b1f3172f1;hp=145c22c7a5ee3877fd0552cea0b2a5bafafa824e;hpb=65cdc09cc3b919637204894351464edbb15b1a54;p=aaf%2Fauthz.git

diff --git a/conf/CA/bootstrap.sh b/conf/CA/bootstrap.sh
index 145c22c7..6ccc6bfa 100644
--- a/conf/CA/bootstrap.sh
+++ b/conf/CA/bootstrap.sh
@@ -1,3 +1,22 @@
+#!/bin/bash
+#########
+#  ============LICENSE_START====================================================
+#  org.onap.aaf
+#  ===========================================================================
+#  Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+#  ===========================================================================
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#  ============LICENSE_END====================================================
 #
 # Streamlined AAF Bootstrap initial Cert
 # Removed Variables so it can be run for AutoDeployments
@@ -13,7 +32,8 @@ if [ ! -e ./serial ]; then
 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
@@ -71,12 +91,12 @@ fi
 
 for ROOT in $(cat san_root.aaf); do
    SANS="$SANS $ROOT"
-   for C in service locate oauth gui cm hello; do
+   for C in service locate oauth token introspect gui cm hello; do
      SANS="$SANS $C.$ROOT"
    done
 done
 
-for C in service locate oauth gui cm hello; do
+for C in service locate oauth token introspect gui cm hello; do
    SANS="$SANS aaf-$C"
    SANS="$SANS aaf-$C.onap"
 done
@@ -122,14 +142,15 @@ $PASSPHRASE
 EOF
 
 # Make Issuer name
-ISSUER=$(openssl x509 -subject -noout -in $SIGNER_CRT | cut -c 10-)
-for I in ${ISSUER//\// }; do
-  if [ -n "$CADI_X509_ISSUER" ]; then
-    CADI_X509_ISSUER=", $CADI_X509_ISSUER"
+ISSUER=$(openssl x509 -subject -noout -in $SIGNER_CRT | cut -c 9- | sed -e 's/ = /=/g' -e 's/\//, /g')
+for I in $ISSUER; do
+  if [ -z "$REVERSE" ]; then
+    REVERSE="${I%,}"
+  else
+    REVERSE="${I%,}, ${REVERSE}"
   fi
-  CADI_X509_ISSUER="$I$CADI_X509_ISSUER"
 done
-echo $CADI_X509_ISSUER > $BOOTSTRAP_ISSUER
+echo "$REVERSE" > $BOOTSTRAP_ISSUER
 
 # Cleanup
 rm -f $BOOTSTRAP_SAN $BOOTSTRAP_KEY $BOOTSTRAP_CSR $BOOTSTRAP_CRT $SIGNER_KEY $SIGNER_CRT $BOOTSTRAP_CHAIN