From ba9126be5f0ddc2b892244eced95144e4d79dffb Mon Sep 17 00:00:00 2001
From: nazunalika <label@rockylinux.org>
Date: Tue, 21 Jun 2022 18:21:01 -0700
Subject: [PATCH] try to fix a few more tests

---
 func/core/pkg_httpd/10-httpd-branding.sh            | 2 +-
 func/core/pkg_postgresql/01-configure-postgresql.sh | 2 +-
 func/core/pkg_release/20-check-gpg-keys.sh          | 4 ++--
 func/core/pkg_shadow-utils/30-group-tests.sh        | 2 +-
 func/core/pkg_tftp-server/01-configure-tftp.sh      | 5 ++++-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/func/core/pkg_httpd/10-httpd-branding.sh b/func/core/pkg_httpd/10-httpd-branding.sh
index 7508411..cbfe6ca 100755
--- a/func/core/pkg_httpd/10-httpd-branding.sh
+++ b/func/core/pkg_httpd/10-httpd-branding.sh
@@ -2,7 +2,7 @@
 r_log "httpd" "Verify httpd branding"
 
 r_log "httpd" "Token"
-curl -sI http://localhost/ | grep -i "Server:\ Apache.*\ (Rocky)" > /dev/null 2>&1
+curl -sI http://localhost/ | grep -i "Server:\ Apache.*\ (Rocky Linux)" > /dev/null 2>&1
 r_checkExitStatus $?
 
 r_log "httpd" "index"
diff --git a/func/core/pkg_postgresql/01-configure-postgresql.sh b/func/core/pkg_postgresql/01-configure-postgresql.sh
index e84e765..0f1cb43 100755
--- a/func/core/pkg_postgresql/01-configure-postgresql.sh
+++ b/func/core/pkg_postgresql/01-configure-postgresql.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 r_log "postgresql" "Initialize postgresql"
 postgresql-setup --initdb
-m_serviceCycler postgresql-server cycle
+m_serviceCycler postgresql cycle
 sleep 15
diff --git a/func/core/pkg_release/20-check-gpg-keys.sh b/func/core/pkg_release/20-check-gpg-keys.sh
index d99b178..9a30354 100755
--- a/func/core/pkg_release/20-check-gpg-keys.sh
+++ b/func/core/pkg_release/20-check-gpg-keys.sh
@@ -4,8 +4,8 @@ if [ "$RL_VER" -eq 8  ]; then
   file /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial > /dev/null 2>&1 && \
     file /etc/pki/rpm-gpg/RPM-GPG-KEY-rockytesting > /dev/null 2>&1
 else
-  file "/etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-${RL_VER}" > /ev/null 2>&1 && \
-    file "/etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-${RL_VER}-Testing" > /ev/null 2>&1
+  file "/etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-${RL_VER}" > /dev/null 2>&1 && \
+    file "/etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-${RL_VER}-Testing" > /dev/null 2>&1
 fi
 
 r_checkExitStatus $?
diff --git a/func/core/pkg_shadow-utils/30-group-tests.sh b/func/core/pkg_shadow-utils/30-group-tests.sh
index 4c30bba..b2e502d 100755
--- a/func/core/pkg_shadow-utils/30-group-tests.sh
+++ b/func/core/pkg_shadow-utils/30-group-tests.sh
@@ -110,6 +110,6 @@ r_log "shadow" "Test sg"
 sg onyxuser "touch /var/tmp/onyxsg"
 r_checkExitStatus $?
 r_log "shadow" "Verify sg worked"
-stat --format="%U" /var/tmp/onyxsg | grep -q onyxuser
+stat --format="%G" /var/tmp/onyxsg | grep -q onyxuser
 r_checkExitStatus $?
 rm /var/tmp/onyxsg
diff --git a/func/core/pkg_tftp-server/01-configure-tftp.sh b/func/core/pkg_tftp-server/01-configure-tftp.sh
index 7766de2..117d8ad 100755
--- a/func/core/pkg_tftp-server/01-configure-tftp.sh
+++ b/func/core/pkg_tftp-server/01-configure-tftp.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 r_log "tftp" "Configure tftp"
 
-cat <<EOF > /etc/xinetd.d/tftp
+if [ "$RL_VER" -eq 8 ]; then
+  cat <<EOF > /etc/xinetd.d/tftp
 service tftp
 {
     socket_type   = dgram
@@ -17,4 +18,6 @@ service tftp
 }
 EOF
 
+fi
+
 m_serviceCycler tftp.socket start