ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-03-22 20:15:16 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

added buildWAr depedency to buildRpm and buildDeb

Browse Source
This commit is contained in:
iadgovuser26 iadgovuser26@empire.eclipse.ncsc.mil 2024-02-16 13:40:03 -05:00
parent c92253ae40
commit a549f28208
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
HIRS_AttestationCAPortal/build.gradle
View File

@ -135,6 +135,7 @@ ospackage {
buildRpm { buildRpm {
dependsOn ':build' dependsOn ':build'
dependsOn ':HIRS_AttestationCAPortal:bootWar'
arch = X86_64 arch = X86_64
// Required apps will be aut installed by dnf if not present // Required apps will be aut installed by dnf if not present
requires('java-17-openjdk', '17.0', GREATER | EQUAL) requires('java-17-openjdk', '17.0', GREATER | EQUAL)
@ -155,6 +156,7 @@ ospackage {
buildDeb { buildDeb {
dependsOn ':build' dependsOn ':build'
dependsOn ':HIRS_AttestationCAPortal:bootWar'
packageName = 'hirs-attestationca' packageName = 'hirs-attestationca'
arch = 'amd64' arch = 'amd64'
requires('openjdk-17-jdk', '17.0', GREATER | EQUAL) requires('openjdk-17-jdk', '17.0', GREATER | EQUAL)
@ -163,9 +165,9 @@ ospackage {
// Install after required packages // Install after required packages
postInstall 'bash /opt/hirs/aca/scripts/aca/aca_setup.sh -u' postInstall 'bash /opt/hirs/aca/scripts/aca/aca_setup.sh -u'
postInstall '/opt/hirs/aca/scripts/aca/aca_bootRun.sh -w &' 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' postInstall 'echo "@reboot root /opt/hirs/aca/scripts/aca/aca_bootRun.sh -w" >> /etc/crontab'
postTrans 'chmod +x /opt/hirs/aca/scripts/aca/*' postInstall 'chmod +x /opt/hirs/aca/scripts/aca/*'
postTrans 'if [ -f /opt/hirs/aca/VERSION ]; then rm /opt/hirs/aca/VERSION; fi;' postInstall 'if [ -f /opt/hirs/aca/VERSION ]; then rm /opt/hirs/aca/VERSION; fi;'
// Wait for ACA to start up before finishing the install // Wait for ACA to start up before finishing the install
postInstall 'bash /opt/hirs/aca/scripts/aca/check_for_aca.sh' postInstall 'bash /opt/hirs/aca/scripts/aca/check_for_aca.sh'
} }

1
package/scripts/db/mysql_util.sh
View File

@ -70,6 +70,7 @@ start_mysqlsd () {
if [ $DB_STATUS -eq 0 ]; then if [ $DB_STATUS -eq 0 ]; then
echo "mariadb not running , attempting to restart" echo "mariadb not running , attempting to restart"
systemctl start mariadb >> "$LOG_FILE"; systemctl start mariadb >> "$LOG_FILE";
sleep 2
fi fi
fi # non contanier mysql start fi # non contanier mysql start
fi fi