From b3a8e31ba07caa06429458e6217f63adc80bf4c7 Mon Sep 17 00:00:00 2001
From: Lazlo Westerhof <l.r.westerhof@uu.nl>
Date: Thu, 21 Nov 2024 10:32:04 +0100
Subject: [PATCH] Add support for AlmaLinux 9

---
 vagrant/build/.env                         | 14 +++++---------
 vagrant/build/install-davrods-build-env.sh | 22 +++++++++++-----------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/vagrant/build/.env b/vagrant/build/.env
index e18ed4e..45cea33 100644
--- a/vagrant/build/.env
+++ b/vagrant/build/.env
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # Tested/supported box names:
-# - generic/rhel9
-# -  generic/ubuntu2204
+# - almalinux/9
+# - generic/ubuntu2204
 BOXNAME=generic/ubuntu2204
 
 # Amount of memory for VM (MB)
@@ -22,15 +22,11 @@ APT_IRODS_REPO_COMPONENT=main
 
 # Packages to be installed (separated by whitespace).
 # Dependencies do not have to be listed. They are resolved by the script
-APT_GEN_PACKAGES="cmake make gcc apache2 apache2-dev rpm libssl-dev"
+APT_GEN_PACKAGES="git vim cmake make gcc apache2 apache2-dev rpm libssl-dev"
 APT_IRODS_PACKAGES="irods-runtime irods-dev"
 
 # Parameters of Yum repository
 YUM_IRODS_REPO_SIGNING_KEY_LOC=https://packages.irods.org/irods-signing-key.asc
 YUM_REPO_FILE_LOC=https://packages.irods.org/renci-irods.yum.repo
-YUM_GEN_PACKAGES="git vim cmake make gcc httpd rpmdevtools openssl-libs openssl-devel httpd-devel"
-YUM_IRODS_PACKAGES="irods-runtime irods-devel"
-
-# Hostnames and IP addresses
-PROVIDER_IP=192.168.2.3
-PROVIDER_HOSTNAME=davrods-dev
+DNF_GEN_PACKAGES="git vim cmake make gcc httpd rpmdevtools openssl-libs openssl-devel httpd-devel"
+DNF_IRODS_PACKAGES="irods-runtime irods-devel"
diff --git a/vagrant/build/install-davrods-build-env.sh b/vagrant/build/install-davrods-build-env.sh
index d301bd3..d1b6249 100644
--- a/vagrant/build/install-davrods-build-env.sh
+++ b/vagrant/build/install-davrods-build-env.sh
@@ -27,35 +27,35 @@ function get_package_version()
 }
 
 
-if [ -f /etc/centos-release ]
+if [ -f /etc/redhat-release ]
 then
 
-  echo "Installing DavRODS build environment on CentOS."
+  echo "Installing DavRODS build environment on AlmaLinux."
 
   echo "Installing dependencies ..."
-  sudo yum -y install wget epel-release yum-plugin-versionlock
+  sudo dnf -y install wget epel-release python3-dnf-plugin-versionlock
 
   echo "Importing repository signing key ..."
   sudo rpm --import "$YUM_IRODS_REPO_SIGNING_KEY_LOC"
 
   echo "Updating certificates for retrieving repository key ..."
-  sudo yum update -y ca-certificates
+  sudo dnf update -y ca-certificates
 
   echo "Adding iRODS repository ..."
-  wget -qO - https://packages.irods.org/renci-irods.yum.repo | sudo tee /etc/yum.repos.d/renci-irods.yum.repo
+  wget -qO - $YUM_REPO_FILE_LOC | sudo tee /etc/yum.repos.d/renci-irods.yum.repo
 
-  for package in $YUM_IRODS_PACKAGES
+  for package in $DNF_IRODS_PACKAGES
   do echo "Installing package $package and its dependencies"
-     get_package_version "$package" "$IRODS_VERSION" "centos"
+     get_package_version "$package" "$IRODS_VERSION" "almalinux"
      # $package_version is set by sourced function
      # shellcheck disable=SC2154
-     sudo yum -y install "$package-$package_version"
-     sudo yum versionlock "$package"
+     sudo dnf -y install "$package-$package_version"
+     sudo dnf versionlock add "$package"
   done
 
-  for package in $YUM_GEN_PACKAGES
+  for package in $DNF_GEN_PACKAGES
   do echo "Installing package $package and its dependencies"
-     sudo yum -y install "$package"
+     sudo dnf -y install "$package"
   done
 
 elif lsb_release -i | grep -q Ubuntu