diff --git a/develop/_sources/authentication/oidc.rst.txt b/develop/_sources/authentication/oidc.rst.txt index ea6bc87fb..52c476c54 100644 --- a/develop/_sources/authentication/oidc.rst.txt +++ b/develop/_sources/authentication/oidc.rst.txt @@ -12,7 +12,7 @@ The following prerequisites need to be satisfied: .. note:: - OnDemand repos provide the ``httpd24-mod_auth_openidc`` RPM for RHEL 7 and CentOS 7 as it must be built against SCL Apache. The OnDemand repos also have the ``mod_auth_openidc`` RPM for RHEL 8 and Rocky 8 that are newer than what the OS provides to make use of some newer features. + The OnDemand repos have the ``mod_auth_openidc`` RPM for RHEL 8 and Rocky 8 that are newer than what the OS provides to make use of some newer features. The following is an example :program:`ood-portal-generator` configuration file: diff --git a/develop/_sources/how-tos/debug/debug-apache.rst.txt b/develop/_sources/how-tos/debug/debug-apache.rst.txt index 6ee58e9ac..fa1375647 100644 --- a/develop/_sources/how-tos/debug/debug-apache.rst.txt +++ b/develop/_sources/how-tos/debug/debug-apache.rst.txt @@ -23,13 +23,6 @@ Restart services .. tabs:: - .. tab:: RHEL/CentOS 7 - - .. code-block:: sh - - sudo systemctl try-restart httpd24-httpd - - .. tab:: RHEL/Rocky 8 & 9 .. code-block:: sh @@ -61,12 +54,6 @@ Or you're using the wrong hostname in your browser. .. tabs:: - .. tab:: RHEL/CentOS 7 - - .. code-block:: sh - - sudo /opt/rh/httpd24/root/sbin/httpd -S - .. tab:: RHEL/Rocky 8 & 9 .. code-block:: sh diff --git a/develop/_sources/how-tos/monitoring/prometheus.rst.txt b/develop/_sources/how-tos/monitoring/prometheus.rst.txt index 05d53b049..65192e448 100644 --- a/develop/_sources/how-tos/monitoring/prometheus.rst.txt +++ b/develop/_sources/how-tos/monitoring/prometheus.rst.txt @@ -33,7 +33,6 @@ For yum/dnf based systems the `ondemand_exporter`_ can be installed via RPM. The RPM will install the following files that should work out of the box: -- **RHEL/CentOS 7 only**: /opt/rh/httpd24/root/etc/httpd/conf.d/ondemand_exporter.conf - **RHEL/Rocky/AlmaLinux 8 & 9 only**: /etc/httpd/conf.d/ondemand_exporter.conf - /etc/sudoers.d/ondemand_exporter @@ -41,12 +40,6 @@ Ensure that the new Apache configuration is loaded by restarting Apache .. tabs:: - .. tab:: RHEL/CentOS 7 - - .. code-block:: sh - - sudo systemctl restart httpd24-httpd - .. tab:: RHEL/Rocky/Alma Linux 8 & 9 .. code-block:: sh @@ -82,13 +75,6 @@ Check for the `ondemand_exporter Latest Release`_ version number. Replace ``VER .. tabs:: - .. tab:: RHEL/CentOS 7 - - .. code-block:: sh - - sudo install -o root -g root -m 0440 /tmp/${ARCHIVE}/files/apache.conf /opt/rh/httpd24/root/etc/httpd/conf.d/ondemand_exporter.conf - sudo systemctl restart httpd24-httpd - .. tab:: RHEL/Rocky/Alma Linux 8 & 9 .. code-block:: sh diff --git a/develop/_sources/installation.rst.txt b/develop/_sources/installation.rst.txt index 050853fcb..e88a21fc5 100644 --- a/develop/_sources/installation.rst.txt +++ b/develop/_sources/installation.rst.txt @@ -6,7 +6,7 @@ Installation The OnDemand host machine needs to be setup *similarly* to a login node. This means that it will need: -- RedHat/CentOS 7+ or Ubuntu 20.04-22.04 or Debian 12 or Amazon Linux 2023 +- RedHat/RockyLinux/AlmaLinux 8+ or Ubuntu 20.04-22.04 or Debian 12 or Amazon Linux 2023 - the resource manager (e.g., Torque, Slurm, or LSF) client binaries and libraries used by the batch servers installed - configuration on both OnDemand node **and batch servers** to be able to diff --git a/develop/_sources/installation/install-software.rst.txt b/develop/_sources/installation/install-software.rst.txt index 0c7152687..110b352a8 100644 --- a/develop/_sources/installation/install-software.rst.txt +++ b/develop/_sources/installation/install-software.rst.txt @@ -33,13 +33,6 @@ Some operating systems use `Software Collections`_ to satisfy these. .. tabs:: - .. tab:: CentOS 7 - - .. code-block:: sh - - sudo yum install centos-release-scl epel-release - - .. tab:: RockyLinux/Alma Linux 8 .. code-block:: sh @@ -79,14 +72,6 @@ Some operating systems use `Software Collections`_ to satisfy these. .. tabs:: - .. tab:: RedHat/CentOS 7 - - .. code-block:: sh - - sudo yum install https://yum.osc.edu/ondemand/{{ ondemand_version }}/ondemand-release-web-{{ ondemand_version }}-1.el7.noarch.rpm - - sudo yum install ondemand - .. tab:: RedHat/Rocky Linux/AlmaLinux 8 .. code-block:: sh @@ -149,14 +134,6 @@ Some operating systems use `Software Collections`_ to satisfy these. .. tabs:: - .. tab:: RHEL/CentOS 7 - - .. code-block:: sh - - sudo systemctl start httpd24-httpd - sudo systemctl enable httpd24-httpd - - .. tab:: RHEL/Rocky 8 & 9 .. code-block:: sh diff --git a/develop/_sources/installation/resource-manager/test.rst.txt b/develop/_sources/installation/resource-manager/test.rst.txt index d223c7209..65d1d9d8c 100644 --- a/develop/_sources/installation/resource-manager/test.rst.txt +++ b/develop/_sources/installation/resource-manager/test.rst.txt @@ -22,18 +22,6 @@ configuration files. #. We will now list all available tasks that we can run: - .. rubric:: If your operating system is CentOS 7 or RHEL 7, run this command: - - .. code-block:: sh - - scl enable ondemand -- bin/rake -T test:jobs - # rake test:jobs # Test all clusters - # rake test:jobs:cluster1 # Test the cluster: cluster1 - # rake test:jobs:cluster2 # Test the cluster: cluster2 - - - .. rubric:: Otherwise, run this command: - .. code-block:: sh source /opt/ood/ondemand/enable diff --git a/develop/_sources/reference/files/nginx-stage-yml.rst.txt b/develop/_sources/reference/files/nginx-stage-yml.rst.txt index 0ec04f0d3..37d189c5b 100644 --- a/develop/_sources/reference/files/nginx-stage-yml.rst.txt +++ b/develop/_sources/reference/files/nginx-stage-yml.rst.txt @@ -788,16 +788,12 @@ Configuration Options min_uid: 1000 Example - Using CentOS 6 + Define new minimum UID .. code-block:: yaml min_uid: 500 - .. note:: - - For RHEL6 and CentOS 6 the user id's begin at ``500``. - .. _disabled_shell: .. describe:: disabled_shell (String) diff --git a/develop/_sources/reference/files/submit-yml/basic-bc-options.rst.txt b/develop/_sources/reference/files/submit-yml/basic-bc-options.rst.txt index 6cfc4bdfc..9832409c5 100644 --- a/develop/_sources/reference/files/submit-yml/basic-bc-options.rst.txt +++ b/develop/_sources/reference/files/submit-yml/basic-bc-options.rst.txt @@ -235,7 +235,7 @@ Basic Batch Connect Options # careful now, we can't override run_file or we have to # change it here too! This also doesn't account for timeout, # if it's provided. - IMAGE=/opt/images/centos7.sif + IMAGE=/opt/images/el9.sif singularity exec -p $IMAGE /bin/bash script.sh .. describe:: script_file (String, "./script.sh") diff --git a/develop/_sources/requirements.rst.txt b/develop/_sources/requirements.rst.txt index bd2a85997..9f372325e 100644 --- a/develop/_sources/requirements.rst.txt +++ b/develop/_sources/requirements.rst.txt @@ -17,7 +17,6 @@ At this time OnDemand only supports the following operating systems and architec :header: "","x86_64","aarch64/arm64","ppc64le" :stub-columns: 1 - "RedHat/CentOS 7",:raw-html:`✅`,:raw-html:`✅`,:raw-html:`✅` "RedHat/Rocky Linux/AlmaLinux 8",:raw-html:`✅`,:raw-html:`✅`,:raw-html:`✅` "RedHat/Rocky Linux/AlmaLinux 9",:raw-html:`✅`,:raw-html:`✅`,:raw-html:`✅` "Ubuntu 20.04",:raw-html:`✅`,:raw-html:`✅`,:raw-html:`❌` diff --git a/develop/authentication/oidc.html b/develop/authentication/oidc.html index 78a4f680e..3b39336ca 100644 --- a/develop/authentication/oidc.html +++ b/develop/authentication/oidc.html @@ -229,7 +229,7 @@

Note

-

OnDemand repos provide the httpd24-mod_auth_openidc RPM for RHEL 7 and CentOS 7 as it must be built against SCL Apache. The OnDemand repos also have the mod_auth_openidc RPM for RHEL 8 and Rocky 8 that are newer than what the OS provides to make use of some newer features.

+

The OnDemand repos have the mod_auth_openidc RPM for RHEL 8 and Rocky 8 that are newer than what the OS provides to make use of some newer features.

The following is an example ood-portal-generator configuration file:

# /etc/ood/config/ood_portal.yml
diff --git a/develop/how-tos/debug/debug-apache.html b/develop/how-tos/debug/debug-apache.html
index 9dc44c923..ea295e1c9 100644
--- a/develop/how-tos/debug/debug-apache.html
+++ b/develop/how-tos/debug/debug-apache.html
@@ -229,13 +229,10 @@ 
Log locations
Restart services

 

 

-
sudo systemctl try-restart httpd24-httpd
+
sudo systemctl try-restart httpd
 

 

-