diff --git a/HIRS_AttestationCAPortal/build.gradle b/HIRS_AttestationCAPortal/build.gradle index b947238d..7d6a9351 100644 --- a/HIRS_AttestationCAPortal/build.gradle +++ b/HIRS_AttestationCAPortal/build.gradle @@ -135,6 +135,7 @@ ospackage { buildRpm { dependsOn ':build' + dependsOn ':HIRS_AttestationCAPortal:bootWar' arch = X86_64 // Required apps will be aut installed by dnf if not present requires('java-17-openjdk', '17.0', GREATER | EQUAL) @@ -155,6 +156,7 @@ ospackage { buildDeb { dependsOn ':build' + dependsOn ':HIRS_AttestationCAPortal:bootWar' packageName = 'hirs-attestationca' arch = 'amd64' requires('openjdk-17-jdk', '17.0', GREATER | EQUAL) @@ -163,9 +165,9 @@ ospackage { // Install after required packages postInstall 'bash /opt/hirs/aca/scripts/aca/aca_setup.sh -u' postInstall '/opt/hirs/aca/scripts/aca/aca_bootRun.sh -w &' - postTrans 'echo "@reboot root /opt/hirs/aca/scripts/aca/aca_bootRun.sh -w" >> /etc/crontab' - postTrans 'chmod +x /opt/hirs/aca/scripts/aca/*' - postTrans 'if [ -f /opt/hirs/aca/VERSION ]; then rm /opt/hirs/aca/VERSION; fi;' + postInstall 'echo "@reboot root /opt/hirs/aca/scripts/aca/aca_bootRun.sh -w" >> /etc/crontab' + postInstall 'chmod +x /opt/hirs/aca/scripts/aca/*' + postInstall 'if [ -f /opt/hirs/aca/VERSION ]; then rm /opt/hirs/aca/VERSION; fi;' // Wait for ACA to start up before finishing the install postInstall 'bash /opt/hirs/aca/scripts/aca/check_for_aca.sh' } diff --git a/package/scripts/db/mysql_util.sh b/package/scripts/db/mysql_util.sh index 49af5731..e2f8a59f 100755 --- a/package/scripts/db/mysql_util.sh +++ b/package/scripts/db/mysql_util.sh @@ -70,6 +70,7 @@ start_mysqlsd () { if [ $DB_STATUS -eq 0 ]; then echo "mariadb not running , attempting to restart" systemctl start mariadb >> "$LOG_FILE"; + sleep 2 fi fi # non contanier mysql start fi