diff --git a/HIRS_AttestationCAPortal/build.gradle b/HIRS_AttestationCAPortal/build.gradle index 6eeb6e78..386074e2 100644 --- a/HIRS_AttestationCAPortal/build.gradle +++ b/HIRS_AttestationCAPortal/build.gradle @@ -87,10 +87,10 @@ ospackage { // Post Install postInstall 'sh /opt/hirs/aca/scripts/aca/aca_setup.sh -u' // add chrontab to run ACA at boot - postInstall 'echo "@reboot sh /opt/hirs/aca/scripts/aca/aca_bootRun.sh -w" >> /etc/crontab' + postInstall 'echo "@reboot root /opt/hirs/aca/scripts/aca/aca_bootRun.sh -w" >> /etc/crontab' // run ACA after install - postInstall 'sh /opt/hirs/aca/scripts/aca/aca_bootRun.sh -w' - postInstall 'chmod +x /opt/hirs/aca/scripts/aca/aca_bootRun.sh' + postInstall '/opt/hirs/aca/scripts/aca/aca_bootRun.sh -w' + postInstall 'chmod +x /opt/hirs/aca/scripts/aca/*' // Uninstall preUninstall 'sh /opt/hirs/aca/scripts/aca/aca_remove_setup.sh' diff --git a/package/scripts/aca/aca_bootRun.sh b/package/scripts/aca/aca_bootRun.sh index 6105d5d1..274dcf3d 100755 --- a/package/scripts/aca/aca_bootRun.sh +++ b/package/scripts/aca/aca_bootRun.sh @@ -127,8 +127,8 @@ WEB_TLS_PARAMS="--server.ssl.key-store-password=$hirs_pki_password \ if [ -z "$USE_WAR" ]; then echo "Booting the ACA from local build..." - ./gradlew bootRun --args="$CONNECTOR_PARAMS$WEB_TLS_PARAMS" + ./gradlew bootRun --args="$CONNECTOR_PARAMS$WEB_TLS_PARAMS" else - echo "Booting the ACA from a $USE_WAR file..." + echo "Booting the ACA from a war file..." java -jar $WAR_PATH $CONNECTOR_PARAMS$WEB_TLS_PARAMS & fi diff --git a/package/scripts/aca/aca_remove_setup.sh b/package/scripts/aca/aca_remove_setup.sh index 61b4c0fe..2bbad173 100755 --- a/package/scripts/aca/aca_remove_setup.sh +++ b/package/scripts/aca/aca_remove_setup.sh @@ -32,6 +32,5 @@ rm -rf /etc/hirs echo "Removing the ACA crontab" sed -i '/aca_bootRun.sh/d' /etc/crontab echo "Shutting down the aca..." -#pkill -f hirs/aca >/dev/null 2>&1; ps axf | grep HIRS_AttestationCAPortal.war | grep -v grep | awk '{print "kill " $1}' | sh >/dev/null 2>&1 echo "ACA setup removal complete." \ No newline at end of file