mirror of
https://github.com/nsacyber/HIRS.git
synced 2025-04-07 11:26:51 +00:00
Added mariadb and java 17 as required packages
This commit is contained in:
parent
2f19166a65
commit
c92253ae40
@ -87,7 +87,7 @@ test {
|
||||
useJUnitPlatform()
|
||||
}
|
||||
|
||||
build {
|
||||
build {
|
||||
doFirst{
|
||||
def verFile = new File(projectDir, "build/VERSION")
|
||||
verFile.write("${jarVersion}")
|
||||
@ -127,32 +127,46 @@ ospackage {
|
||||
user 'root'
|
||||
fileMode = 0755
|
||||
}
|
||||
|
||||
// Post Install
|
||||
postInstall 'bash /opt/hirs/aca/scripts/aca/aca_setup.sh -u'
|
||||
// add chrontab to run ACA at boot
|
||||
postInstall 'echo "@reboot root /opt/hirs/aca/scripts/aca/aca_bootRun.sh -w" >> /etc/crontab'
|
||||
// run ACA after install
|
||||
postInstall '/opt/hirs/aca/scripts/aca/aca_bootRun.sh -w &'
|
||||
postInstall 'chmod +x /opt/hirs/aca/scripts/aca/*'
|
||||
postInstall 'bash /opt/hirs/aca/scripts/aca/check_for_aca.sh'
|
||||
postInstall 'if [ -f /opt/hirs/aca/VERSION ]; then rm /opt/hirs/aca/VERSION; fi;'
|
||||
|
||||
|
||||
// Uninstall
|
||||
preUninstall 'bash /opt/hirs/aca/scripts/aca/aca_remove_setup.sh'
|
||||
postUninstall 'rm -rf /etc/hirs'
|
||||
postUninstall 'rm -rf /opt/hirs'
|
||||
|
||||
buildRpm {
|
||||
dependsOn ':build'
|
||||
arch = X86_64
|
||||
requires('java-17-openjdk', '17.0', GREATER|EQUAL)
|
||||
// Required apps will be aut installed by dnf if not present
|
||||
requires('java-17-openjdk', '17.0', GREATER | EQUAL)
|
||||
requires('mariadb-server' , '10.3' , GREATER | EQUAL)
|
||||
requires('procps-ng', '3.3.15', GREATER | EQUAL)
|
||||
|
||||
// Post Trans stage (Occurs after required app and postInstall stage)
|
||||
// Note postInstall wont wait forrequired apps
|
||||
postTrans 'bash /opt/hirs/aca/scripts/aca/aca_setup.sh -u'
|
||||
postTrans '/opt/hirs/aca/scripts/aca/aca_bootRun.sh -w &'
|
||||
// add chrontab to run ACA at boot
|
||||
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;'
|
||||
// Wait for ACA to start up before finishing the install
|
||||
postTrans 'bash /opt/hirs/aca/scripts/aca/check_for_aca.sh'
|
||||
}
|
||||
|
||||
buildDeb {
|
||||
dependsOn ':build'
|
||||
packageName = 'hirs-attestationca'
|
||||
arch = 'amd64'
|
||||
requires('openjdk-17-jdk', '17.0', GREATER|EQUAL)
|
||||
requires('mariadb-server' , '10.3' , GREATER|EQUAL)
|
||||
requires('openjdk-17-jdk', '17.0', GREATER | EQUAL)
|
||||
requires('mariadb-server' , '10.3' , GREATER | EQUAL)
|
||||
requires('curl')
|
||||
// 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;'
|
||||
// Wait for ACA to start up before finishing the install
|
||||
postInstall 'bash /opt/hirs/aca/scripts/aca/check_for_aca.sh'
|
||||
}
|
||||
}
|
||||
|
@ -30,11 +30,14 @@ popd &>/dev/null
|
||||
# remove pki files and config files if not installed by rpm
|
||||
echo "Removing certificates and config files..."
|
||||
|
||||
if [ -d "/etc/hirs" ]; then
|
||||
rm -rf /etc/hirs >/dev/null 2>&1
|
||||
fi
|
||||
if [ -d "/opt/hirs" ]; then
|
||||
rm -rf /opt/hirs >/dev/null 2>&1
|
||||
# Remove /opt/hirs only if not configured by a package basedd install:
|
||||
if [ ! -f /etc/hirs/aca/VERSION ]; then
|
||||
# if [ -d "/etc/hirs" ]; then
|
||||
# rm -rf /etc/hirs >/dev/null 2>&1
|
||||
# fi
|
||||
if [ -d "/opt/hirs" ]; then
|
||||
rm -rf /opt/hirs >/dev/null 2>&1
|
||||
fi
|
||||
fi
|
||||
|
||||
# Remove crontab and current ACA process
|
||||
|
@ -88,9 +88,7 @@ fi
|
||||
echo "HIRS ACA Setup initiated on $(date +%Y-%m-%d)" >> "$LOG_FILE"
|
||||
|
||||
# Create a version file for bootRun to use
|
||||
git --version 2>&1 >/dev/null
|
||||
GIT_AVAILABLE=$?
|
||||
if [ $GIT_AVAILABLE -eq 0 ]; then
|
||||
if command -v git ; then
|
||||
jarVersion=$(cat '../../../VERSION').$(date +%s).$(git rev-parse --short HEAD)
|
||||
echo $jarVersion > $ACA_VERSION_FILE
|
||||
fi
|
||||
|
@ -74,7 +74,7 @@ check_mysql_root_pwd () {
|
||||
DB_ADMIN_PWD=$(head -c 64 /dev/urandom | md5sum | tr -dc 'a-zA-Z0-9')
|
||||
echo "DB Admin will be set to $DB_ADMIN_PWD , please make note for next mysql use."
|
||||
# Check UNATTENDED flag set m if not then prompt user for permission ot store mysql root password
|
||||
if [ -z $UNATTENDED ]; then
|
||||
if [ -z $UNATTEmariadb-serverNDED ]; then
|
||||
read -p "Do you wish to save this password to the aca.properties file? " confirm
|
||||
if [[ $confirm == [yY] || $confirm == [yY][eE][sS] ]]; then
|
||||
echo "mysql_admin_password=$DB_ADMIN_PWD" >> $ACA_PROP_FILE
|
||||
|
Loading…
x
Reference in New Issue
Block a user