diff --git a/README.md b/README.md index 3d253b56fe..cfc310ef83 100644 --- a/README.md +++ b/README.md @@ -238,16 +238,13 @@ clone it or create a symbolic link to it at `open_xdmod/modules/supremm`. #### Source -This process has been tested on CentOS 7. Known issues are documented in the +This process has been tested on Rocky 8. Known issues are documented in the [Building FAQ](#building-faq) below. If you run into any issues not listed below on these or any other platforms, please let us know. The tested version -of composer is 1.10.25 on CentOS 7 and 2.4.2 on Rocky 8. +of composer is 2.6.0 on Rocky 8. 1. Change directory to the root of the Open XDMoD repository. 1. Install Composer dependencies for Open XDMoD. - - `export COMPOSER=composer-el[7|8].json` - - use `el7` if you are building this on CentOS7 w/ PHP5.4 - - use `el8` if you are building this on CentOS8 ( or equivalent ) w/ PHP7.2 - `composer install` - Depending on the versions of various software installed on your system, you may run into errors. If you do, see the [Building FAQ](#building-faq) @@ -261,7 +258,7 @@ The resulting tarball will be located in `open_xdmod/build`. #### RPM -This process has been tested on CentOS 7. Known issues are documented in the +This process has been tested on Rocky 8. Known issues are documented in the [Building FAQ](#building-faq) below. If you run into any issues not listed below on these or any other platforms, please let us know. @@ -287,20 +284,6 @@ The resulting RPM will be located in `~/rpmbuild/RPMS/noarch`. ### Building FAQ -#### Why is Composer unable to download some files? - -Certain combinations of PHP and Composer do not handle redirects over HTTPS -correctly. This is known to affect the version of PHP that CentOS 6 supplies -combined with current stable versions of Composer (as of this writing, 1.3.2). -To get things working, try one or more steps below. - - 1. Update Composer to a newer version. - 1. If the above did not work or is not feasible, you can globally disable - HTTPS in Composer by running `composer config -g disable-tls true`. While - disabling HTTPS is not recommended by the Composer developers or us, all - dependencies downloaded using XDMoD's config files will be checked - against checksums to help prevent against tampering. - #### Why is Composer failing to unzip Ext JS? Older versions of Composer (< 1.3.2) had issues with the Ext JS zip file. diff --git a/docs/configuration.md b/docs/configuration.md index 352c1a5909..f45960d657 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -203,7 +203,7 @@ in the RPM install and `share/templates/apache.conf` in the source code install. This template file must be copied to the Apache configuration directory and edited to update site specific configuration settings. -For CentOS 7, RHEL 7, Rocky 8, and RHEL 8 the template file should be copied to `/etc/httpd/conf.d/xdmod.conf` +For Rocky 8 and RHEL 8 the template file should be copied to `/etc/httpd/conf.d/xdmod.conf`. For other Linux distributions consult the distribution documentation to determine the path to the webserver configuration files. diff --git a/templates/apache.conf b/templates/apache.conf index 59a4a26426..c3f5645ac7 100644 --- a/templates/apache.conf +++ b/templates/apache.conf @@ -2,7 +2,7 @@ # be copied to the Apache configuration directory and # edited to specify the correct site-specific settings. # -# On CentOS 7 and RHEL 7, this file should be copied +# On Rocky 8 and RHEL 8, this file should be copied # to: # /etc/httpd/conf.d/xdmod.conf #