ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2024-12-18 20:47:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added maraidb-server and java 17 as RPM dependencies

Browse Source
This commit is contained in:
iadgovuser26 iadgovuser26@empire.eclipse.ncsc.mil 2024-02-14 09:53:57 -05:00
parent 522bca3549
commit 2f19166a65
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
HIRS_AttestationCAPortal/build.gradle
View File

@ -2,7 +2,7 @@ plugins {
id 'application'
id 'java'
id 'war'
id 'com.netflix.nebula.ospackage' version '11.4.0'
id 'com.netflix.nebula.ospackage' version '11.8.0'
id 'org.springframework.boot' version '3.0.6'
id 'io.spring.dependency-management' version '1.1.0'
id 'checkstyle'
@ -93,14 +93,14 @@ build {
verFile.write("${jarVersion}")
}
}
ospackage {
packageName = 'HIRS_AttestationCA'
os = LINUX
arch = NOARCH
version = "$packVersion"
release = '1'
user 'root'
fileMode = 0755
@ -144,11 +144,15 @@ ospackage {
buildRpm {
dependsOn ':build'
arch = X86_64
requires('java-17-openjdk', '17.0', GREATER|EQUAL)
requires('mariadb-server' , '10.3' , GREATER | EQUAL)
}
buildDeb {
dependsOn ':build'
packageName = 'hirs-attestationca'
arch = 'amd64'
requires('openjdk-17-jdk', '17.0', GREATER|EQUAL)
requires('mariadb-server' , '10.3' , GREATER|EQUAL)
}
}

8
package/scripts/aca/aca_setup.sh
View File

@ -88,8 +88,12 @@ fi
echo "HIRS ACA Setup initiated on $(date +%Y-%m-%d)" >> "$LOG_FILE"
# Create a version file for bootRun to use
jarVersion=$(cat '../../../VERSION').$(date +%s).$(git rev-parse --short HEAD)
echo $jarVersion > $ACA_VERSION_FILE
git --version 2>&1 >/dev/null
GIT_AVAILABLE=$?
if [ $GIT_AVAILABLE -eq 0 ]; then
jarVersion=$(cat '../../../VERSION').$(date +%s).$(git rev-parse --short HEAD)
echo $jarVersion > $ACA_VERSION_FILE
fi
# Set HIRS PKI password
if [ -z $HIRS_PKI_PWD ]; then