sshtepa/toolkit
1
0
Fork 0
forked from sig_core/toolkit
Code Pull Requests Activity

try to fix a few more tests

Browse Source
This commit is contained in:
Louis Abel 2022-06-21 18:21:01 -07:00
parent 12bb69379b
commit ba9126be5f
Signed by untrusted user: label
GPG Key ID: B37E62D143879B36
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
func/core/pkg_httpd/10-httpd-branding.sh
View File

@ -2,7 +2,7 @@
r_log "httpd" "Verify httpd branding" r_log "httpd" "Verify httpd branding"
r_log "httpd" "Token" 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_checkExitStatus $?
r_log "httpd" "index" r_log "httpd" "index"

2
func/core/pkg_postgresql/01-configure-postgresql.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
r_log "postgresql" "Initialize postgresql" r_log "postgresql" "Initialize postgresql"
postgresql-setup --initdb postgresql-setup --initdb
m_serviceCycler postgresql-server cycle m_serviceCycler postgresql cycle
sleep 15 sleep 15

4
func/core/pkg_release/20-check-gpg-keys.sh
View File

@ -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-rockyofficial > /dev/null 2>&1 && \
file /etc/pki/rpm-gpg/RPM-GPG-KEY-rockytesting > /dev/null 2>&1 file /etc/pki/rpm-gpg/RPM-GPG-KEY-rockytesting > /dev/null 2>&1
else 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}" > /dev/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}-Testing" > /dev/null 2>&1
fi fi
r_checkExitStatus $? r_checkExitStatus $?

2
func/core/pkg_shadow-utils/30-group-tests.sh
View File

@ -110,6 +110,6 @@ r_log "shadow" "Test sg"
sg onyxuser "touch /var/tmp/onyxsg" sg onyxuser "touch /var/tmp/onyxsg"
r_checkExitStatus $? r_checkExitStatus $?
r_log "shadow" "Verify sg worked" 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 $? r_checkExitStatus $?
rm /var/tmp/onyxsg rm /var/tmp/onyxsg

3
func/core/pkg_tftp-server/01-configure-tftp.sh
View File

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
r_log "tftp" "Configure tftp" r_log "tftp" "Configure tftp"
if [ "$RL_VER" -eq 8 ]; then
cat <<EOF > /etc/xinetd.d/tftp cat <<EOF > /etc/xinetd.d/tftp
service tftp service tftp
{ {
@ -17,4 +18,6 @@ service tftp
} }
EOF EOF
fi
m_serviceCycler tftp.socket start m_serviceCycler tftp.socket start