Updated aca_bootRun script

This commit is contained in:
iadgovuser26 2023-07-07 20:54:02 +00:00 committed by iadgovuser26
parent 146d05961d
commit a8e5758cf4
4 changed files with 17 additions and 15 deletions

View File

@ -35,7 +35,7 @@ server.port=8443
server.ssl.enabled=true
server.ssl.trust-store-type=JKS
server.ssl.trust-store=/etc/hirs/certificates/HIRS/TrustStore.jks
server.ssl.trust-store-password=53d035ff814c1dd5c7e303f5fa080c18
server.ssl.trust-alias=hirs_aca_tls_rsa_3k_sha384
server.ssl.key-store-type=JKS
server.ssl.key-store=/etc/hirs/certificates/HIRS/KeyStore.jks
server.ssl.key-alias=hirs_aca_tls_rsa_3k_sha384
@ -50,6 +50,3 @@ server.ssl.key-alias=hirs_aca_tls_rsa_3k_sha384
# Passwords get appended here ...
spring.datasource.password=hirs_db
server.ssl.trust-store-password=53d035ff814c1dd5c7e303f5fa080c18
server.ssl.key-store-password=53d035ff814c1dd5c7e303f5fa080c18

View File

@ -22,9 +22,9 @@ else
exit 1
fi
echo "server_ssl_trust-store-password = " ${props["server.ssl.trust-store-password"]}
echo "server_ssl_key-store-password = " ${props["server.ssl.key-store-password"]}
#echo "server_ssl_trust-store-password = " ${props["server.ssl.trust-store-password"]}
#echo "server_ssl_key-store-password = " ${props["server.ssl.key-store-password"]}
#./gradlew bootRun --args=--server.ssl.trust-store-password=${props["server.ssl.trust-store-password"]},--server.ssl.key-store-password=${props["server.ssl.key-store-password"]}
echo "Starting HIRS ACA on https://localhost:8443/HIRS_AttestationCAPortal/portal/index"
./gradlew bootRun --args="--server.ssl.trust-store-password=53d035ff814c1dd5c7e303f5fa080c18 --server.ssl.key-store-password=53d035ff814c1dd5c7e303f5fa080c18"
./gradlew bootRun --args="--server.ssl.trust-store-password=${props["server.ssl.trust-store-password"]} --server.ssl.key-store-password=${props["server.ssl.key-store-password"]}"

View File

@ -2,6 +2,8 @@
# Capture location of the script to allow from invocation from any location
SCRIPT_DIR=$( dirname -- "$( readlink -f -- "$0"; )"; )
mkdir -p /etc/hirs/aca
pushd $SCRIPT_DIR
sh ../db/db_create.sh

View File

@ -6,7 +6,7 @@
#
############################################################################################
PROP_FILE=/etc/hirs/aca/apllication.properties
PROP_FILE=/etc/hirs/aca/application.properties
# Capture location of the script to allow from invocation from any location
SCRIPT_DIR=$( dirname -- "$( readlink -f -- "$0"; )"; )
@ -30,12 +30,6 @@ fi
# echo "aca property file exists, skipping"
# fi
# Add password to properties file
echo "server.ssl.key-store-password="$PKI_PASS >> $PROP_FILE
echo "server.ssl.trust-store-password="$PKI_PASS >> $PROP_FILE
# Clear out previous pki password and set new password in the application.properties file for embedded tomcat
popd &> /dev/null
# Create Cert Chains
@ -55,6 +49,15 @@ if [ ! -d "/etc/hirs/certificates" ]; then
sh $PKI_SETUP_DIR/pki_chain_gen.sh "HIRS" "rsa" "3072" "sha384" "$PKI_PASS"
sh $PKI_SETUP_DIR/pki_chain_gen.sh "HIRS" "ecc" "512" "sha384" "$PKI_PASS"
popd &> /dev/null
# Add/Replace password to properties file
if [ -f $PROP_FILE ]; then
sed -i '/server.ssl.key-store-password/d' $PROP_FILE
sed -i '/server.ssl.trust-store-password/d' $PROP_FILE
fi
echo "server.ssl.key-store-password="$PKI_PASS >> $PROP_FILE
echo "server.ssl.trust-store-password="$PKI_PASS >> $PROP_FILE
else
echo "/etc/hirs/certificates exists, skipping"
fi