diff --git a/docs/centos.md b/docs/centos.md
index 3313c0aa7109a4f8430ceb2f294ad3b7bc8818f6..f606af7006989595b74e10d1d83a2e08027075c3 100644
--- a/docs/centos.md
+++ b/docs/centos.md
@@ -2,28 +2,62 @@
## What is CentOS ?
-From [CentOS web site](https://centos.org/about/):
+From [CentOS web site](https://centos.org/):
-> The CentOS Linux distribution is a stable, predictable, manageable and reproduceable platform derived from the sources of Red Hat Enterprise Linux (RHEL). We are now looking to expand on that by creating the resources needed by other communities to come together and be able to build on the CentOS Linux platform. And today we start the process by delivering a clear governance model, increased transparency and access. In the coming weeks we aim to publish our own roadmap that includes variants of the core CentOS Linux.
+> Community-driven free software effort focused around the goal of providing a rich platform for open source communities to build upon.
-The CentOS Core distribution is basically [ Red Hat ] Enterprise Linux, recompiled from source.
+The CentOS project currently provides two Linux variants:
-## And CERN CentOS (CC)?
+CentOS Linux (version 7)
-CERN CentOS (CC) is CERN customized distribution that is built on top of the CentOS Core and it is tailored to integrate within the CERN computing environment.
+> Consistent, manageable platform that suits a wide variety of deployments
-CERN CentOS is fully compatible with CentOS Core therefore with the [ Red Hat ] Enterprise Linux: all software used or built on one of the versions should function properly on any other version.
+CentOS Stream (version 8 and 9)
-## Which one should I use?
+> Continously delivered distribution that tracks just ahead of Red Hat Enterprise Linux (RHEL), positioned as a midstream between Fedora Linux and RHEL
-If your system is installed at CERN you should definitely use CERN provided version: the CERN CentOS (CC), that is the only version we provide support for installations made on CERN site.
+# CentOS Linux
-If your system is located outside CERN lab, you may still use CC there: CERN customizations and site integration we provide for CERN users shall be inobtrusive for others and are not activated by default if the system is installed outside CERN network: and, of course, your system will still receive all the security, enhancement and bugfix errata.
+CentOS Linux has always been a 'rebuild' of RedHat Enterprise Linux (RHEL), meaning that the distribution was built by taking the source code from RHEL and repackaging and releasing it as CentOS Linux. For this reason CentOS Linux was always a direct copy of what existed in RHEL, without the support that is usually included with RHEL.
-## What happened to Scientific Linux CERN (SLC) ?
+Previously CentOS Linux followed the same life as the upstream RHEL product, this being a 10 year life cycle.
+
+In December 2020, the CentOS project changed their operating model and announced:
+
+* CentOS Linux 8 would have it's end of life changed from this historic 10 year life cycle to instead 2 years (thus setting the end of life to be 31.12.2021)
+* The life cycle of CentOS Linux 7 was not affected by this annoucement
+* There will not be a "CentOS Linux 9", and instead all efforts from the CentOS project will be focused into CentOS Stream
+
+# CentOS Stream
+
+With CentOS Stream, Red Hat is doing their development work out in the open. They will continue to take Fedora releases and perform their QA on them, but now they will assemble all their changes publicly as CentOS Stream. Every 6 months or so, Red Hat will take CentOS Stream and rebuild it as a new RHEL point release
+
+CentOS Stream will have a life cycle of 5 years
+
+CentOS Stream will be more up-to-date than RHEL, whereas CentOS Linux has traditionally lagged behind
+
+
+## CentOS versions at CERN?
-As described at [Next Linux version @ CERN](/news/slc-nextversion) next major Linux releases (starting with version 7) at CERN will be based on [CentOS Linux](https://centos.org/).
+For the 7 family: **CERN CentOS (CC7)** is CERN customized distribution that is built on top of the CentOS Linux 7 and it is tailored to integrate within the CERN computing environment.
-CERN CentOS 7.1 (CC71) release [is available](/centos7) as of 01.04.2015.
+* CC7 was made available at CERN on 01.04.2015 and support will end on 30.06.2024
+* More information on CC7 can be found on the dedicated [CC7](/centos7) page
+
+For the 8 family: **CentOS Stream 8 (CS8)** is provided by using the upstream content. Integration to the CERN computing environment is still possible via the addon 'CERN' repository
+
+* CS8 was made available at CERN on 01.04.2021 and support will end on 31.05.2024
+* More information on CS8 can be found on the dedicated [CS8](/centos8) page
+
+For the 9 family: **CentOS Stream 9 (CS9)** is provided by using the upstream content. Integration to the CERN computing environment is still possible via the addon 'CERN' repository
+
+* CS9 was made available at CERN on 09.02.2022 and support will end of 31.12.2026
+
+## Which version should I use?
+
+We currently recommend using either CC7 or CS8 for new deployments.
+Both distributions have roughly the same support life time. CS8 is more recent and as such has access to newer software, kernel and features.
+
+## What happened to Scientific Linux CERN (SLC) ?
-A Test CERN CentOS 7 (CC7) version [is available](/centos7) as of 04.08.2014.
+Scientific Linux CERN (SLC) was the distribution that CERN used prior to using CentOS Linux. SLC is no longer used at CERN
diff --git a/docs/centos8/docs/index.md b/docs/centos8/docs/index.md
index 0f964b7bcbc6a10e5fba2852ceb5f94483c5ff43..d72c3e8ce29222a0c33dae2e31ee17a3734088dd 100644
--- a/docs/centos8/docs/index.md
+++ b/docs/centos8/docs/index.md
@@ -1,4 +1,4 @@
-# CentOS Stream 8 and CentOS Linux 8 Documentation
+# CentOS Stream 8 Documentation
* [Documentation pages](/centos8/docs)
* [Installation instructions](/centos8/docs/install)
diff --git a/docs/centos8/docs/install.md b/docs/centos8/docs/install.md
index e27ba3a0cfbcb165acb1303eab81d04d1733a533..e5f18d07d81c6f8b307c04c67b4c087f5731c903 100644
--- a/docs/centos8/docs/install.md
+++ b/docs/centos8/docs/install.md
@@ -1,11 +1,11 @@
-# CentOS Stream 8 / CentOS Linux 8 - Install instructions
+# CentOS Stream 8 - Install instructions
-The following methods are currently available to install CentOS Stream 8 / CentOS Linux 8
+The following methods are currently available to install CentOS Stream 8
-* AIMS interactive - select the menu item `Install CentOS Stream 8 (CS8) 64-bit system` or `Install CentOS 8 Linux (C8) 64-bit system`
-* AIMS host registration - define your host to use the `CS8_X64_64` (Stream) or `C8_X86_64` (Linux) target
-* OpenStack VM - boot from the image `CS8 - x86_64 [YYYY-MM-DD` (Stream) or `C8 - x86_64 [YYYY-MM-DD]` (linux)
-* ai-bs puppet managed VM - use `ai-bs --cs8` or `ai-bs --c8`
-* docker image - use `docker pull gitlab-registry.cern.ch/linuxsupport/cs8-base:latest` (Stream) or `docker pull gitlab-registry.cern.ch/linuxsupport/c8-base:latest` (Linux)
+* AIMS interactive - select the menu item `Install CentOS Stream 8 (CS8) 64-bit system`
+* AIMS host registration - define your host to use the `CS8_X64_64` (Stream)
+* OpenStack VM - boot from the image `CS8 - x86_64 [YYYY-MM-DD` (Stream)
+* ai-bs puppet managed VM - use `ai-bs --cs8`
+* docker image - use `docker pull gitlab-registry.cern.ch/linuxsupport/cs8-base:latest`
For a detailed installation of a Linux Desktop, check the [step by step guide](/centos8/docs/stepbystep)
diff --git a/docs/centos8/docs/installshots/add-cern-repo.png b/docs/centos8/docs/installshots/add-cern-repo.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab7e22deb9d2c6f60a2017b58bc291818059ea0e
Binary files /dev/null and b/docs/centos8/docs/installshots/add-cern-repo.png differ
diff --git a/docs/centos8/docs/installshots/c8-1.jpg b/docs/centos8/docs/installshots/c8-1.jpg
deleted file mode 100644
index c3f699e45d62f904ce6c5c527eb579608ada36e1..0000000000000000000000000000000000000000
Binary files a/docs/centos8/docs/installshots/c8-1.jpg and /dev/null differ
diff --git a/docs/centos8/docs/installshots/c8-2.jpg b/docs/centos8/docs/installshots/c8-2.jpg
deleted file mode 100644
index db46825383b9483538fd7466217972ea8b97152e..0000000000000000000000000000000000000000
Binary files a/docs/centos8/docs/installshots/c8-2.jpg and /dev/null differ
diff --git a/docs/centos8/docs/installshots/c8-3.jpg b/docs/centos8/docs/installshots/c8-3.jpg
deleted file mode 100644
index c340f9b7a3d0a7fcb5b71181a68feda9112a3815..0000000000000000000000000000000000000000
Binary files a/docs/centos8/docs/installshots/c8-3.jpg and /dev/null differ
diff --git a/docs/centos8/docs/installshots/c8-4.jpg b/docs/centos8/docs/installshots/c8-4.jpg
deleted file mode 100644
index bb657f8eab8eaf193198601245e34f45b13ccd86..0000000000000000000000000000000000000000
Binary files a/docs/centos8/docs/installshots/c8-4.jpg and /dev/null differ
diff --git a/docs/centos8/docs/installshots/c8-5.jpg b/docs/centos8/docs/installshots/c8-5.jpg
deleted file mode 100644
index 117b24044a2e029b22bfd0637bb72a30d74db559..0000000000000000000000000000000000000000
Binary files a/docs/centos8/docs/installshots/c8-5.jpg and /dev/null differ
diff --git a/docs/centos8/docs/installshots/c8-6.jpg b/docs/centos8/docs/installshots/c8-6.jpg
deleted file mode 100644
index 2f28b5b8d479af8bd811559d29b5905fc47fcb70..0000000000000000000000000000000000000000
Binary files a/docs/centos8/docs/installshots/c8-6.jpg and /dev/null differ
diff --git a/docs/centos8/docs/installshots/config.png b/docs/centos8/docs/installshots/config.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f587650d424370e681d56e0787e59cf33789544
Binary files /dev/null and b/docs/centos8/docs/installshots/config.png differ
diff --git a/docs/centos8/docs/installshots/initial-setup-options.png b/docs/centos8/docs/installshots/initial-setup-options.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd08bea6252c7b61e59e789b4bdc4d31f2b62204
Binary files /dev/null and b/docs/centos8/docs/installshots/initial-setup-options.png differ
diff --git a/docs/centos8/docs/installshots/initial-setup.png b/docs/centos8/docs/installshots/initial-setup.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa48ccec9942f35e44e11b8d66ef5047a44b3382
Binary files /dev/null and b/docs/centos8/docs/installshots/initial-setup.png differ
diff --git a/docs/centos8/docs/installshots/lang.png b/docs/centos8/docs/installshots/lang.png
new file mode 100644
index 0000000000000000000000000000000000000000..1626b35e69845019ef81ac3cd72fc7e8c17321dc
Binary files /dev/null and b/docs/centos8/docs/installshots/lang.png differ
diff --git a/docs/centos8/docs/installshots/partitioning.png b/docs/centos8/docs/installshots/partitioning.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd3303c8d06e06684f9154bfb3515ed6af384c9a
Binary files /dev/null and b/docs/centos8/docs/installshots/partitioning.png differ
diff --git a/docs/centos8/docs/installshots/ready-to-go.png b/docs/centos8/docs/installshots/ready-to-go.png
new file mode 100644
index 0000000000000000000000000000000000000000..7663777f7f69008149aacbc9e70b8f07a58a8c4e
Binary files /dev/null and b/docs/centos8/docs/installshots/ready-to-go.png differ
diff --git a/docs/centos8/docs/installshots/reclaim.png b/docs/centos8/docs/installshots/reclaim.png
new file mode 100644
index 0000000000000000000000000000000000000000..88c5288cf212f0836039dce15d4289f1e60bc97b
Binary files /dev/null and b/docs/centos8/docs/installshots/reclaim.png differ
diff --git a/docs/centos8/docs/installshots/rootpass.png b/docs/centos8/docs/installshots/rootpass.png
new file mode 100644
index 0000000000000000000000000000000000000000..d338aec51b830422855b06b435f1e3d2c5989377
Binary files /dev/null and b/docs/centos8/docs/installshots/rootpass.png differ
diff --git a/docs/centos8/docs/installshots/software-selection.png b/docs/centos8/docs/installshots/software-selection.png
new file mode 100644
index 0000000000000000000000000000000000000000..c194c1ae2207a9b7525ee24706666434fbf90294
Binary files /dev/null and b/docs/centos8/docs/installshots/software-selection.png differ
diff --git a/docs/centos8/docs/locmap.md b/docs/centos8/docs/locmap.md
index aae1649dfc707f429e1a1f94a15901a9ecbe31b2..5ef1565a7c2bc70ffc4086540799470b261c89a1 100644
--- a/docs/centos8/docs/locmap.md
+++ b/docs/centos8/docs/locmap.md
@@ -1,6 +1,6 @@
-# CentOS Stream 8 / CentOS Linux 8 - Locmap
+# CentOS Stream 8 - Locmap
-Locmap is typically installed by default when installing a new CentOS Stream 8 / CentOS Linux 8 system and selecting 'Software Development Workstation (CERN Recommended Setup)' during the installation.
+Locmap is typically installed by default when installing a new CentOS Stream 8 system and selecting 'Software Development Workstation (CERN Recommended Setup)' during the installation.
In the event that locmap is not available, you may follow these instructions to install it.
@@ -34,6 +34,7 @@ lpadmin [disabled]
postfix [disabled]
ssh [disabled]
sudo [disabled]
+zoom [disabled]
```
You can configure all enabled module with the following command:
diff --git a/docs/centos8/docs/singleuser.md b/docs/centos8/docs/singleuser.md
index a4bc858aa278e8cf659c5cbc8f90cb8e8d098ba7..d29963c9b8a855f16f04258f2fbb031680765302 100644
--- a/docs/centos8/docs/singleuser.md
+++ b/docs/centos8/docs/singleuser.md
@@ -1,6 +1,6 @@
-# CentOS 8 - Single User Mode
+# CentOS Stream 8 - Single User Mode
-If you require to boot CentOS8 in Single User Mode you may follow these instructions:
+If you require to boot CentOS Stream 8 in Single User Mode you may follow these instructions:
1. Boot the system and at the grub menu, press 'e' to edit the kernel boot parameters
2. Move to the 'linux' line and add to the end of the line 'init=/bin/bash'. Press Ctl+x to boot the kernel with this parameter
diff --git a/docs/centos8/docs/stepbystep.md b/docs/centos8/docs/stepbystep.md
index 3135ac4d7c760e2b07817eabdbb93b2fe7b24ce9..51b4509819c0bfd293c586b9f394de65959e7515 100644
--- a/docs/centos8/docs/stepbystep.md
+++ b/docs/centos8/docs/stepbystep.md
@@ -1,4 +1,4 @@
-# CentOS 8 - Installation instructions
+# CentOS Stream 8 - Installation instructions
## Before you start
@@ -18,9 +18,9 @@
* Prepare boot media (you will need a single recordable CD or USB memory key).
(Check the [boot media preparation](/centos8/docs/bootmedia) page for instructions how to prepare (and check) your boot media.)
-* Available boot media - **boot CD/USB image** [http://linuxsoft.cern.ch/cern/centos/s8/BaseOS/x86_64/os/images/boot.iso](http://linuxsoft.cern.ch/cern/centos/s8/BaseOS/x86_64/os/images/boot.iso) (CentOS Stream 8) or [http://linuxsoft.cern.ch/cern/centos/8/BaseOS/x86_64/os/images/boot.iso](http://linuxsoft.cern.ch/cern/centos/8/BaseOS/x86_64/os/images/boot.iso) (CentOS Linux 8)
+* Available boot media - **boot CD/USB image** [http://linuxsoft.cern.ch/cern/centos/s8/BaseOS/x86_64/os/images/boot.iso](http://linuxsoft.cern.ch/cern/centos/s8/BaseOS/x86_64/os/images/boot.iso) (CentOS Stream 8)
-* Installation method - **http**: [http://linuxsoft.cern.ch/cern/centos/s8/BaseOS/x86_64/os](http://linuxsoft.cern.ch/cern/centos/s8/BaseOS/x86_64/os/) (CentOS Stream 8) or [http://linuxsoft.cern.ch/cern/centos/8/BaseOS/x86_64/os](http://linuxsoft.cern.ch/cern/centos/8/BaseOS/x86_64/os/) (CentOS Linux 8)
+* Installation method - **http**: [http://linuxsoft.cern.ch/cern/centos/s8/BaseOS/x86_64/os](http://linuxsoft.cern.ch/cern/centos/s8/BaseOS/x86_64/os/) (CentOS Stream 8)
* Note: use CD/USB image installation method **ONLY** if Network/PXE installation is not possible.
@@ -29,105 +29,77 @@
Installation language and keyboard selection:
-
+
-Select 'Installation Destination', 'Date & Time', 'Installation Source' and 'Software Selection' are already preselected:
+You will need to provide input for the items marked in red, 'Keyboard', 'Time & Date', 'Software Selection', 'Installation Destination'. It's best to start with 'Installation Destination'
-
+
Select the device to be used for the installation:
-
+
If selected device has been already used for previous version of operating system use 'Reclaim space':
-
+
-Select 'Begin installation':
-
-
-
-Set 'root' (administrative account) password.
-Note: 'User creation' option creates only local user accounts, NOT CERN accounts. Once completed, click on reboot to reboot the system:
-
-
-
-## Manual post-install configuration adjustment
+Set the 'root' (administrative account) password.
-If you have selected not to run X graphical environment on your machine, or you have installed system using kickstart and you want to apply site configuration settings, here is a short recipe:
+
-* Install Locmap
- * Run `dnf install locmap-release`
- * Run `dnf install locmap`
+Select the software to install. Choose 'Software Development Workstation (CERN Recommended Setup)'
+
-* AFS client:
- * Run `/usr/bin/locmap --enable afs`
- * Run `/usr/bin/locmap --enable kerberos`
- * Run `/usr/bin/locmap --configure all`
+!!! danger ""
+ If you do NOT see 'Software Development Workstation (CERN Recommended Setup), you may need to add the CERN repository to the installation. You can do by clicking 'Installation Source' and referring to the following screen shot
-* Automatic update system (can also be set for machines outside CERN network)
- * Run `dnf install dnf-autoupdate`
+
-* Apply CERN site configuration defaults
-Run `for module in afs chrony cvmfs kerberos lpadmin postfix ssh sudo; do sudo locmap --enable $module; done` followed by `/usr/bin/locmap --configure all` to configure all locmap modules in your system
+Your screen should now have no more items in 'red', and should look similar to this:
+Select 'Begin installation':
-You can use `/usr/bin/locmap --list` to check all the available puppet modules with their current state.
+
-* Configure CVMFS filesystem
- * Run `/usr/bin/locmap --enable cvmfs` to enable the cvmfs puppet module
- * and then run `/usr/bin/locmap --configure cvmfs` to setup CVMFS filesystem
+## Automatic CERN site specific configuration
-* Check currently running/enabled services:
- * via `/usr/bin/systemctl list-units`
- * turn off those services you do not need: `/usr/bin/systemctl stop servicename`; `/usr/bin/systemctl disable servicename`
- * turn on other services (once you configured them) via `/usr/bin/systemctl enable servicename`
- * To immediately start the service, use `/usr/bin/systemctl start servicename`
+After the successful installation, if you have selected 'Software Development Workstation (CERN Recommended Setup)' the initial configuration screen will be displayed
+
-## Locmap default puppet modules will configure user accounts, root access, printers
+Upon clicking on 'CERN CUSTOMIZATIONS', you will be presented with the following options.
-After the successfull installation and initial configuration of the system, if the computer is on the CERN network and you chose the default options locmap script should have already create user accounts, provide root access, add printers, ... based on the Xldap information of the device. Otherwise as root, run:
+
-```
-/usr/bin/locmap --configure all
-```
+Depending on your choice, the locmap tool will be installed and invoked to create user accounts, provide root access, add printers, ... using information based on the ownership of device (network.cern.ch)
-This will:
+## Manual post-install configuration adjustment
-* Forward root e-mails to the LanDB responsible by updating `/root/.forward`
-* Configure `/root/.k5login` to allow Kerberized root access for the LanDB responsible
-* Configure `/etc/sudoers` to allow sudo root access for the LanDB responsible
-* Add AFS accounts for the LanDB responsible and main users.
-* Add printers in the building(s) where the machine resides and where the LANdb responsible and main users have their offices.
+If you have selected not to run X graphical environment on your machine, or you have not installed your system with the 'Software Development Workstation (CERN Recommended Setup)' but wish to profit from the locmap tool to perform site specific configurations, here are some small recipes:
-Note that this tool expands E-groups.
+* First become root by either logging in as root, or using sudo
+ * Run `sudo su -`
-Alternatively, you can (as root):
+* To configure automatic system updates
+ * Run `dnf install dnf-autoupdate`
-* run _/usr/sbin/addusercern_ **my_login_id** to add AFS user accounts
+* Install Locmap (the tool used to define CERN specific configuration)
+ * Run `dnf install locmap-release`
+ * Run `dnf install locmap`
-* edit `/root/.forward` to forward e-mails sent to the root account, and make sure the SElinux context is correct. Example:
+* Apply CERN site configuration defaults (full configuration)
+ * Run `locmap --enable all`
+ * Run `locmap --configure all`
-```
-# cat /root/.forward
-User.Name@cern.ch
-# restorecon /root/.forward
-# ls -Z /root/.forward
--rw-r--r--. root root system_u:object_r:mail_home_t:s0 /root/.forward
-```
+* Install AFS client (only):
+ * Run `locmap --enable afs`
+ * Run `locmap --enable kerberos`
+ * Run `locmap --configure all`
-* edit `/root/.k5login` to allow kerberized root logins, and make sure the SElinux context is correct. Example:
+* Configure CVMFS (only)
+ * Run `locmap --enable cvmfs`
+ * Run `locmap --configure all`
-```
-# cat /root/.k5login
-my_login_id@CERN.CH
-# restorecon /root/.k5login
-# ls -Z /root/.k5login
--rw-r--r--. root root system_u:object_r:krb5_home_t:s0 /root/.k5login
-```
-* add centrally managed printers with `/usr/sbin/lpadmincern printername --add`
- A list of all printers available at CERN in given building can be obtained using:
- `# /usr/sbin/lpadmincern --building XXXX --list`
+You can also use `/usr/bin/locmap --list` to check all the available puppet modules with their current state.
## Applying software updates
diff --git a/docs/centos8/index.md b/docs/centos8/index.md
index d3e7a7e0037fb1c3b3f69ab8364576201a19c254..7b9de045f58f1604d41e015e0ee291ee13bacccc 100644
--- a/docs/centos8/index.md
+++ b/docs/centos8/index.md
@@ -1,14 +1,14 @@
-# CentOS 8
+# CentOS Linux & CentOS Stream 8
-## What is CentOS 8?
+## What was CentOS Linux 8?
-The CentOS Project is a community-driven free software effort focused on delivering a robust open source ecosystem around a Linux platform. Packages contained in CentOS are built from source code from the RedHat Enterprise Linux (RHEL) distribution. More information on the CentOS project can be found upstream at the [CentOS website](https://www.centos.org/).
+The CentOS Project is a community-driven free software effort focused on delivering a robust open source ecosystem around a Linux platform. Packages contained in CentOS Linux are built from source code from the RedHat Enterprise Linux (RHEL) distribution. More information on the CentOS project can be found upstream at the [CentOS website](https://www.centos.org/).
-## Change of end-of-life of CentOS 8
+## Change of end-of-life of CentOS Linux 8
-On the 8th of December 2020, the CentOS Project [announced](https://blog.centos.org/2020/12/future-is-centos-stream/) it was shifting its focus from CentOS to CentOS Stream, starting with the latest version, CentOS 8. Support for CentOS 8 will end at the end of 2021, and support for CentOS Stream 8 will continue until 2024. Prior to this announcement, CentOS 8 was slated to be supported until 2029.
+On the 8th of December 2020, the CentOS Project [announced](https://blog.centos.org/2020/12/future-is-centos-stream/) it was shifting its focus from CentOS Linux to CentOS Stream, starting with the latest version, CentOS Linux 8. Support for CentOS Linux 8 will end at the end of 2021, and support for CentOS Stream 8 will continue until 2024. Prior to this announcement, CentOS Linux 8 was slated to be supported until 2029.
-## What's the difference between CentOS and CentOS Stream?
+## What's the difference between CentOS Linux and CentOS Stream?
Currently, CentOS is a rebuild of Red Hat Enterprise Linux (RHEL). In order to build RHEL, Red Hat engineers take a Fedora release, perform all their QA tests and assemble all the changes they want to make in their internal repositories. They rebuild all their packages and produce a new release of RHEL. Once this process is done, they push their sources to the CentOS public git repository. At this point, the CentOS project takes these source RPMs, rebuilds them and produces a new release of CentOS.
@@ -20,7 +20,7 @@ CentOS Stream will be more up-to-date than RHEL, whereas CentOS has traditionall
No, Red Hat will continue their internal QA workflow. CentOS Stream will get the updates that have passed that QA process.
-## Can a CentOS machine be upgraded to CentOS Stream
+## Can a CentOS Linux machine be upgraded to CentOS Stream
Yes, migrating from one to the other is simply a matter of changing the repositories you get your updates from.
@@ -30,7 +30,7 @@ For more details on how to do this, please refer to our [CentOS Linux 8 to CentO
No, the major implication of this change is that support for major releases is shortend to 5 years. New major CentOS Stream releases should come out regularly with an overlap of 2-3 years, providing an upgrade path.
-After 2024, CentOS Stream 8 will no longer be maintained. CentOS Stream 9 is estimated to be ready for production by 2022.
+After 2024, CentOS Stream 8 will no longer be maintained.
## How is CERN going to adapt to this?
@@ -44,31 +44,32 @@ CERN and Fermilab have been evaluating a number of options in view of the sudden
## Release status
-* CentOS 8 @ CERN was initially introduced via an [ASDF session](https://indico.cern.ch/event/866058/) on the 12.12.2019
-* The operating system is supported by CERN IT as the next production linux distribution of CERN, as of April 2020. We strongly encourage all users of SLC6 and CC7 to migrate to C8/CS8.
+* CentOS Linux 8 @ CERN was initially introduced via an [ASDF session](https://indico.cern.ch/event/866058/) on the 12.12.2019
+* CentOS Linux 8 reached it's end of life on the 31.12.2021, it is **no longer supported at CERN**
+* CentOS Stream 8 was made available at CERN on the 01.04.2021 and is currently a supported operating system, until 31.05.2024
-
-## How does CERN use CentOS 8?
+## How does CERN use CentOS Stream 8?
### System updates
-CentOS 8 updates are staged
+CentOS Stream 8 updates are staged
-* A 'production' [repository](http://linuxsoft.cern.ch/cern/centos/8/) is provided, which most systems will use and is updated once per week (except for critical security vulnerability patches)
-* A 'testing' [repository](http://linuxsoft.cern.ch/cern/centos/8-testing/) is also provided which is updated daily
-* Snapshots of CentOS repositories are performed daily and can be found at [this URL](http://linuxsoft.cern.ch/cern/centos/8-snapshots/)
+* A 'production' [repository](http://linuxsoft.cern.ch/cern/centos/s8/) is provided, which most systems will use and is updated once per week (except for critical security vulnerability patches)
+* A 'testing' [repository](http://linuxsoft.cern.ch/cern/centos/s8-testing/) is also provided which is updated daily
+* Snapshots of CentOS repositories are performed daily and can be found at [this URL](http://linuxsoft.cern.ch/cern/centos/s8-snapshots/)
* The 'cern-yum-tool' is a new package that can be used to easily switch between 'production', 'testing' or 'snapshot' repositories
* The 'yum-autoupdate' package is provided for automatic (distro-sync) updates (the same as CC7).
### Modified packages
-* centos-release:
- * Yum repositories files changed to use <http://linuxsoft.cern.ch/cern/centos/8/>
+* centos-stream-release:
+ * Yum repositories files changed to use <http://linuxsoft.cern.ch/cern/centos/s8/>
+* centos-gpg-keys:
* Added CERN Koji RPM signing keys
* epel-release:
* Yum repositories files changed to use <http://linuxsoft.cern.ch/>
-**Note**: Unless otherwise stated above, CentOS 8 packages (rpms) are the very same packages released by the upstream CentOS team.
+**Note**: Unless otherwise stated above, CentOS Stream 8 packages (rpms) are the very same packages released by the upstream CentOS team.
## Deployment / Howto
diff --git a/docs/dockerimages.md b/docs/dockerimages.md
index f7845a5cec3dfd37c1149c4acefcc7a52057f435..1dd9da11e54ab2dd53964c5088a42164f2449ba9 100644
--- a/docs/dockerimages.md
+++ b/docs/dockerimages.md
@@ -8,16 +8,16 @@ These images can be used as the base for your own images, by extending its conte
The following names correspond to the latest base images
+* [CentOS Stream 9](/centos9/): `gitlab-registry.cern.ch/linuxsupport/cs9-base`
* [CentOS Stream 8](/centos8/): `gitlab-registry.cern.ch/linuxsupport/cs8-base`
-* [CentOS Linux 8](/centos8/): `gitlab-registry.cern.ch/linuxsupport/c8-base`
* [CERN CentOS 7](/centos7/): `gitlab-registry.cern.ch/linuxsupport/cc7-base`
## CERN's DockerHub page
The following names correspond to the latest base images
+* [CentOS Stream 9](/centos9/): `cern/cs9-base`
* [CentOS Stream 8](/centos8/): `cern/cs8-base`
-* [CentOS Linux 8](/centos8/): `cern/c8-base`
* [CERN CentOS 7](/centos7/): `cern/cc7-base`
## Use
diff --git a/docs/docs/index.md b/docs/docs/index.md
index 093a28f1145087a4c964e95a5b86a5671d25174c..f39a854ecb4983dc8ff9a0bc41039b2e8f441817 100644
--- a/docs/docs/index.md
+++ b/docs/docs/index.md
@@ -9,7 +9,7 @@
<h2>Documentation for CERN supported releases</h2>
<ul>
- <li><a href="/centos8/docs/">CentOS Stream 8 / CentOS Linux 8 documentation</a>
+ <li><a href="/centos8/docs/">CentOS Stream 8 documentation</a>
<li><a href="/centos7/docs/">CERN CentOS 7 documentation</a>
<li><strike><a href="/scientific6/docs/">Scientific Linux CERN 6 documentation</a></strike> SLC6 supported ended November 2020.
<li><strike><a href="http://linux-old.web.cern.ch/linux/scientific5/docs/">Scientific Linux CERN 5 documentation</a></strike> SLC 5 support ended March 2019.
@@ -39,7 +39,6 @@
<li>
<a href="account-mgmt">Advanced user account management using LDAP</a>
<li>
-<a href="wts">Accessing Windows Terminal Services from Linux</a></li>
<li>
<a href="http://redhat.com/support" target="_new">Red Hat support
@@ -55,6 +54,7 @@
<h2>Deprecated / historical documentation</h2>
<strike>
<ul>
+<li><a href="wts">Accessing Windows Terminal Services from Linux</a></li>
<li><a href="phaseoutsmb1">Phase-out of SMB version 1 protocol (Samba access to Windows shares/DFS)</a></li>
<li><a href="msexchange">Thunderbird integration with MS Exchange 2007/2010 Calendaring and Tasks</a>
<li><a href="ssokrb5">Using Kerberos (passwordless) authentication for CERN Single Sign On (SSO)</a>
diff --git a/docs/installation/aims/aims2client.md b/docs/installation/aims/aims2client.md
index d1322083d01b0682a19f87f6c0ac0939db627799..f0d643cfe9f87e17ff7ae38e9435acbfa8974dac 100644
--- a/docs/installation/aims/aims2client.md
+++ b/docs/installation/aims/aims2client.md
@@ -6,7 +6,7 @@ As a side note, if you plan on performing physical automated installations in th
## Install the client
-The client is available through YUM for C8. CC7 clients are no longer supported. Check http://linuxsoft.cern.ch/internal/repos/linuxsupport8-stable/ for latest versions.
+The client is available through YUM for CS8. CC7 clients are no longer supported. Check http://linuxsoft.cern.ch/internal/repos/linuxsupport8s-stable/ for latest versions.
It is recommended to use [`aiadm.cern.ch`](https://cern.service-now.com/service-portal/CERN?id=functional_element&name=aiadm) as it includes many other related tools and will always keep the latest compatible version.
@@ -297,7 +297,7 @@ name, architecture, kernel append options, description
To display more information about PXE boot media add the `--full` or `--all` options as per the example
```bash
-aims2client showimage C8_X86_64 --full
+aims2client showimage CS8_X86_64 --full
```
The additional information displayed, extending the above is:
@@ -309,10 +309,10 @@ source of Kernel, md5sum, size (kb), source of initrd, md5sum, size (kb), e-grou
`NAME` can also be provided with basic wildcards. Consider the example below.
```bash
-showimage C8*
+showimage CS8*
```
-This will return PXE boot media whose name begings with `C8`
+This will return PXE boot media whose name begings with `CS8`
!!! warning
Please note, in some terminals it is necessary to escape * with either \* or "*"
@@ -338,10 +338,10 @@ To display a list of PXE boot targets available for installation please use the
aims2client showimage \*
```
-If you just wanted to see what C8 targets are available you would execute
+If you just wanted to see what CS8 targets are available you would execute
```bash
-aims2client showimage c8*
+aims2client showimage cs8*
```
### Disabling PXE for a device
diff --git a/docs/installation/aims/index.md b/docs/installation/aims/index.md
index b4f269fd495a99b9a496cc3a1ccb7fa4e57a9c44..370d741b662542e2f2e9063272a9ff89fa5e3109 100644
--- a/docs/installation/aims/index.md
+++ b/docs/installation/aims/index.md
@@ -43,7 +43,7 @@ from `aiadm`. For more information, please check our [Configuration Management](
Automated installation uses <a href="https://pykickstart.readthedocs.io/en/latest/kickstart-docs.html#chapter-1-introduction">kickstart</a> installation
method for detailed guide, please see:
- * [Red Hat Enterprise Linux 8 Kickstart Syntax Reference (applicable to C8)](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/performing_an_advanced_rhel_installation/kickstart-commands-and-options-reference_installing-rhel-as-an-experienced-user)
+ * [Red Hat Enterprise Linux 8 Kickstart Syntax Reference (applicable to CS8)](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/performing_an_advanced_rhel_installation/kickstart-commands-and-options-reference_installing-rhel-as-an-experienced-user)
* [Red Hat Enterprise Linux 7 Kickstart Syntax Reference (applicable to CC7)](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/installation_guide/sect-kickstart-syntax#sect-kickstart-commands)
@@ -51,7 +51,7 @@ method for detailed guide, please see:
#### Software installation
-The client is available through YUM for C8. CC7 clients are no longer supported. Check http://linuxsoft.cern.ch/internal/repos/linuxsupport8-stable/ for latest versions. You can use it directly from [`aiadm`](https://cern.service-now.com/service-portal/CERN?id=functional_element&name=aiadm) to avoid installing it yourself.
+The client is available through YUM for CS8. CC7 clients are no longer supported. Check http://linuxsoft.cern.ch/internal/repos/linuxsupport8s-stable/ for latest versions. You can use it directly from [`aiadm`](https://cern.service-now.com/service-portal/CERN?id=functional_element&name=aiadm) to avoid installing it yourself.
Install aims2 client package by running as root:
diff --git a/docs/installation/bootmedia.md b/docs/installation/bootmedia.md
index 0bd269d6aaf6fc7e6bceb7b8101f1b54ca5b513c..37f71053e2e52609dcbca64620b83d1a892e61d7 100644
--- a/docs/installation/bootmedia.md
+++ b/docs/installation/bootmedia.md
@@ -5,5 +5,4 @@ Using boot media (CD/floppy/USB key)
If your computer is not capable of PXE network boot you will need to prepare installation media first. For detailed instruction on installation and setup of supported Linux versions please visit:
* CentOS Stream 8 [installation instructions](/centos8/docs/install).
-* CentOS Linux 8 [installation instructions](/centos8/docs/install).
* CERN CentOS 7 (CC 7)[installation instructions](/centos7/docs/install).
diff --git a/docs/installation/pxeboot.md b/docs/installation/pxeboot.md
index 8f085a3033f3399e3484230722610438b0cdc7b4..37077c1ad768593847fdf550bb81cd18cce84e8a 100644
--- a/docs/installation/pxeboot.md
+++ b/docs/installation/pxeboot.md
@@ -16,7 +16,7 @@ In order to use PXE for installation:
3. After a short while an installation menu will allow you to choose with Arrow and Enter keys which version of Linux you would like to install on your computer. For detailed instructions on installation and setup of supported Linux versions please visit:
-* CentOS Stream 8 / CentOS Linux 8 [installation instructions](/centos8/docs/install).
+* CentOS Stream 8 [installation instructions](/centos8/docs/install).
* CERN CentOS 7 (CC 7)[installation instructions](/centos7/docs/install).
For more information, see the [AIMS](/installation/aims/) description.
diff --git a/docs/openstack.md b/docs/openstack.md
index 8d07bc6ec9e5a63e1be26ef60b107c736392b65a..62c0ad82912af3088c8f8e1b907209a1abc32efb 100644
--- a/docs/openstack.md
+++ b/docs/openstack.md
@@ -12,8 +12,8 @@ Cloud images are available to all Openstack projects.
These are the naming conventions:
+* `CS9 - x86_64 [YYYY-MM-DD]`
* `CS8 - x86_64 [YYYY-MM-DD]`
-* `C8 - x86_64 [YYYY-MM-DD]`
* `CC7 - x86_64 [YYYY-MM-DD]`
These are the images that will be used for [creating a virtual node](https://configdocs.web.cern.ch/nodes/create/index.html).
diff --git a/docs/other.md b/docs/other.md
deleted file mode 100644
index 614bcbcec74984007acee5f71d4c3960059c8ab4..0000000000000000000000000000000000000000
--- a/docs/other.md
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--#include virtual="/linux/layout/header" -->
-# Other Linux versions / Linux products
-
-In addition to CERN CentOS 7 (CC7); we provide some additional Linux products and Linux versions for use by the CERN community.
-Some of these are available only to licence holders (such as Red Hat Enterprise Linux versions), while others are freely available. For more information please read product pages listed below.
-
-<h4>Currently the following other Linux versions are available</h4>
-<em>Note:</em> These versions are only available to license holders at CERN.
-<ul>
- <li><a href="/rhel/">Red Hat Enterprise Linux versions 6, 7 and 8</a>
-</ul>
-
-<h4>Currently the following other Linux products are available</h4>
-<ul>
-<li><a href="/rt/">RealTime</a> (cc7)</li>
-<li><a href="/libreoffice">LibreOffice 6.X</a>(cc7)</li>
-<li><a href="/scl/">Software Collections and Developer Toolset</a>(cc7)</li>
-</ul>
-
-## Linux community at CERN
-For questions beyond the mandate of this service, please refer to the <a href='https://linux-community.web.cern.ch/'>Linux community forum</a> at CERN.
diff --git a/docs/scientific.md b/docs/scientific.md
deleted file mode 100644
index 013f14d06b210cf46308c8d79b368647e9ce46a2..0000000000000000000000000000000000000000
--- a/docs/scientific.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# What is Scientific Linux (SL) ?
-
-From [Scientific Linux web site](http://www.scientificlinux.org/):
-
-> SL is a Linux release put together by Fermilab, CERN, and various other labs and universities around the world. Its primary purpose is to reduce duplicated effort of the labs, and to have a common install base for the various experimenters.
-
-> The base SL distribution is basically [ Red Hat ] Enterprise Linux, recompiled from source.
-
-> Our main goal for the base distribution is to have everything compatible with Enterprise, with only a few minor additions or changes. An example of of items that were added are Pine, and OpenAFS.
-
-> Our secondary goal is to allow easy customization for a site, without disturbing the Scientific Linux base. The various labs are able to add their own modifications to their own site areas. By the magic of scripts, and the anaconda installer, each site is to be able to create their own distributions with minimal effort. Or, if a users wishes, they can simply install the base SL release.
-
-## And Scientific Linux CERN (SLC) ?
-
-SLC is an SL variant that is built on top of the genuine SL and it is tailored to integrate within the CERN computing environment.
-
-SLC is fully compatible with SL therefore with the [ Red Hat ] Enterprise Linux: all software used or built on one of the versions should function properly on any other version.
-
-## Which one should I use ?
-
-If your system is installed at CERN you should definitely use CERN provided version: the Scientific Linux CERN, that is the only version we provide support for installations made on CERN site.
-
-If your system is located outside CERN lab, you may still use SLC there: CERN customizations and site integration we provide for CERN users shall be inobtrusive for others and are not activated by default if the system is installed outside CERN network: and, of course, your system will still receive all the security, enhancement and bugfix errata.
-
-## .. in numbers
-
-As of March 2009 around **36000** systems run Scientific Linux (SL), around **14000** systems run Scientific Linux CERN (SLC).
-
-Above includes only systems updating regularily from either SL or SLC main distribution servers.
\ No newline at end of file
diff --git a/docs/software/index.md b/docs/software/index.md
index 4bcc08afc150e81ae3a12d91136c9971ea035875..f23ab3ede7f007ee1d5090facd3643f54577abda 100644
--- a/docs/software/index.md
+++ b/docs/software/index.md
@@ -4,7 +4,15 @@
<h2>Linuxsoft: Software Repository Service</h2>
<h3>CERN Supported Linux Distributions:</h3>
<ul>
-<li><a href="http://linuxsoft.cern.ch/cern/centos/s8/">/cern/centos/s8/</a> <b>Latest CERN Linux distribution: CentOS Stream 8 (CS8)</b>
+ <li><a href="http://linuxsoft.cern.ch/cern/centos/s9/">/cern/centos/s9/</a><b>Currently supported CERN Linux distribution: CentOS Stream 9 (CS9)</b>
+ <ul>
+ <li><a href="http://linuxsoft.cern.ch/cern/centos/s9/BaseOS/x86_64/os/images/">/cern/centos/s9/BaseOS/x86_64/os/images/</a> Installation media images for x86_64
+ <li><a href="http://linuxsoft.cern.ch/cern/centos/s9/BaseOS/x86_64/os/Packages/">/cern/centos/s9/BaseOS/x86_64/os/Packages/</a> Updates (BaseOS)
+ <li><a href="http://linuxsoft.cern.ch/cern/centos/s9/AppStream/x86_64/os/Packages/">/cern/centos/s9/AppStream/x86_64/os/Packages/</a> Updates (AppStream)
+ <li><a href="http://linuxsoft.cern.ch/cern/centos/s9/CERN/x86_64/Packages/">/cern/centos/s9/CERN/x86_64/Packages/</a> CERN packages for CS9
+ </ul>
+ </li>
+ <li><a href="http://linuxsoft.cern.ch/cern/centos/s8/">/cern/centos/s8/</a> <b>Currently supported CERN Linux distribution: CentOS Stream 8 (CS8)</b>
<ul>
<li><a href="http://linuxsoft.cern.ch/cern/centos/s8/BaseOS/x86_64/os/images/">/cern/centos/s8/BaseOS/x86_64/os/images/</a> Installation media images for x86_64
<li><a href="http://linuxsoft.cern.ch/cern/centos/s8/BaseOS/x86_64/os/Packages/">/cern/centos/s8/BaseOS/x86_64/os/Packages/</a> Updates (BaseOS)
@@ -12,15 +20,7 @@
<li><a href="http://linuxsoft.cern.ch/cern/centos/s8/CERN/x86_64/Packages/">/cern/centos/s8/CERN/x86_64/Packages/</a> CERN packages for CS8
</ul>
</li>
- <li><a href="http://linuxsoft.cern.ch/cern/centos/8/">/cern/centos/8/</a> <b>Latest CERN Linux distribution: CentOS 8 (C8)</b>
- <ul>
- <li><a href="http://linuxsoft.cern.ch/cern/centos/8/BaseOS/x86_64/os/images/">/cern/centos/8/BaseOS/x86_64/os/images/</a> Installation media images for x86_64
- <li><a href="http://linuxsoft.cern.ch/cern/centos/8/BaseOS/x86_64/os/Packages/">/cern/centos/8/BaseOS/x86_64/os/Packages/</a> Updates (BaseOS)
- <li><a href="http://linuxsoft.cern.ch/cern/centos/8/AppStream/x86_64/os/Packages/">/cern/centos/8/AppStream/x86_64/os/Packages/</a> Updates (AppStream)
- <li><a href="http://linuxsoft.cern.ch/cern/centos/8/CERN/x86_64/Packages/">/cern/centos/8/CERN/x86_64/Packages/</a> CERN packages for C8
- </ul>
- </li>
- <li><a href="http://linuxsoft.cern.ch/cern/centos/7/">/cern/centos/7/</a> <b>Previous CERN Linux distribution: CERN CentOS 7 (CC7)</b>
+ <li><a href="http://linuxsoft.cern.ch/cern/centos/7/">/cern/centos/7/</a> <b>Currently supported CERN Linux distribution: CERN CentOS 7 (CC7)</b>
<ul>
<li><a href="http://linuxsoft.cern.ch/cern/centos/7/os/x86_64/images/">/cern/centos/7/os/x86_64/images/</a> Installation media images for x86_64
<li><a href="http://linuxsoft.cern.ch/cern/centos/7/updates/">/cern/centos/7/updates/</a> Updates for CC7
@@ -28,7 +28,15 @@
<li><a href="http://linuxsoft.cern.ch/cern/centos/7/cern/">/cern/centos/7/cern/</a> CERN packages for CC7
</ul>
</li>
- <li><a href="http://linuxsoft.cern.ch/cern/slc6X">/cern/slc6X/</a> <b>Previous CERN Linux distribution: Scientific Linux CERN 6 (SLC6)</b>
+ <li><a href="http://linuxsoft.cern.ch/cern/centos/8/">/cern/centos/8/</a> <b>Previous (deprecated) CERN Linux distribution: CentOS 8 (C8)</b>
+ <ul>
+ <li><a href="http://linuxsoft.cern.ch/cern/centos/8/BaseOS/x86_64/os/images/">/cern/centos/8/BaseOS/x86_64/os/images/</a> Installation media images for x86_64
+ <li><a href="http://linuxsoft.cern.ch/cern/centos/8/BaseOS/x86_64/os/Packages/">/cern/centos/8/BaseOS/x86_64/os/Packages/</a> Updates (BaseOS)
+ <li><a href="http://linuxsoft.cern.ch/cern/centos/8/AppStream/x86_64/os/Packages/">/cern/centos/8/AppStream/x86_64/os/Packages/</a> Updates (AppStream)
+ <li><a href="http://linuxsoft.cern.ch/cern/centos/8/CERN/x86_64/Packages/">/cern/centos/8/CERN/x86_64/Packages/</a> CERN packages for C8
+ </ul>
+ </li>
+ <li><a href="http://linuxsoft.cern.ch/cern/slc6X">/cern/slc6X/</a> <b>Previous (deprecated) CERN Linux distribution: Scientific Linux CERN 6 (SLC6)</b>
<ul>
<li><a href="http://linuxsoft.cern.ch/cern/slc6X/i386/images/">/cern/slc6X/i386/images/</a> Installation media images for x86 (i386)
<li><a href="http://linuxsoft.cern.ch/cern/slc6X/x86_64/images/">/cern/slc6X/x86_64/images/</a> Installation media images for x86_64
@@ -39,17 +47,31 @@
<h3>Browseable Package repositories:</h3>
+
<ul>
- <li>C 8X:
+ <li>CS9:
+ <ul>
+ <li>for x86_64: <a href="http://linuxsoft.cern.ch/cern/centos/s9/AppStream/x86_64/os/Packages/">AppStream</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9/BaseOS/x86_64/os/Packages/">BaseOS</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9/CERN/x86_64/Packages/">CERN</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9/Devel/x86_64/os/Packages/">Devel</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9/HighAvailability/x86_64/os/Packages/">HighAvailability</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9/PowerTools/x86_64/os/Packages/">PowerTools</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9/centosplus/x86_64/os/Packages/">centosplus</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9/cloud/x86_64/">cloud</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9/extras/x86_64/os/Packages/">extras</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9/fasttrack/x86_64/os/Packages/">fasttrack</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9/messaging/x86_64/">messaging</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9/openafs/x86_64/Packages/">openafs</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9/sclo/x86_64/">sclo</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9/virt/x86_64/">virt</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9-testing/AppStream/x86_64/os/Packages/">AppStream (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9-testing/BaseOS/x86_64/os/Packages/">BaseOS (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9-testing/CERN/x86_64/Packages/">CERN (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9-testing/Devel/x86_64/os/Packages/">Devel (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9-testing/HighAvailability/x86_64/os/Packages/">HighAvailability (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9-testing/PowerTools/x86_64/os/Packages/">PowerTools (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9-testing/centosplus/x86_64/os/Packages/">centosplus (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9-testing/cloud/x86_64/">cloud (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9-testing/extras/x86_64/os/Packages/">extras (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9-testing/fasttrack/x86_64/os/Packages/">fasttrack (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9-testing/messaging/x86_64/">messaging (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9-testing/openafs/x86_64/Packages/">openafs (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9-testing/sclo/x86_64/">sclo (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s9-testing/virt/x86_64/">virt (testing)</a>
+ </ul>
+
+ <li>CS8:
<ul>
- <li>for x86_64: <a href="http://linuxsoft.cern.ch/cern/centos/8/AppStream/x86_64/os/Packages/">AppStream</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/BaseOS/x86_64/os/Packages/">BaseOS</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/CERN/x86_64/Packages/">CERN</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/Devel/x86_64/os/Packages/">Devel</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/HighAvailability/x86_64/os/Packages/">HighAvailability</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/PowerTools/x86_64/os/Packages/">PowerTools</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/centosplus/x86_64/os/Packages/">centosplus</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/cloud/x86_64/">cloud</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/cr/x86_64/os/Packages/">cr</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/extras/x86_64/os/Packages/">extras</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/fasttrack/x86_64/os/Packages/">fasttrack</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/messaging/x86_64/">messaging</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/openafs/x86_64/Packages/">openafs</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/sclo/x86_64/">sclo</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/virt/x86_64/">virt</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/AppStream/x86_64/os/Packages/">AppStream (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/BaseOS/x86_64/os/Packages/">BaseOS (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/CERN/x86_64/Packages/">CERN (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/Devel/x86_64/os/Packages/">Devel (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/HighAvailability/x86_64/os/Packages/">HighAvailability (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/PowerTools/x86_64/os/Packages/">PowerTools (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/centosplus/x86_64/os/Packages/">centosplus (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/cloud/x86_64/">cloud (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/cr/x86_64/os/Packages/">cr (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/extras/x86_64/os/Packages/">extras (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/fasttrack/x86_64/os/Packages/">fasttrack (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/messaging/x86_64/">messaging (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/openafs/x86_64/Packages/">openafs (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/sclo/x86_64/">sclo (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/virt/x86_64/">virt (testing)</a>
+ <li>for x86_64: <a href="http://linuxsoft.cern.ch/cern/centos/s8/AppStream/x86_64/os/Packages/">AppStream</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8/BaseOS/x86_64/os/Packages/">BaseOS</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8/CERN/x86_64/Packages/">CERN</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8/Devel/x86_64/os/Packages/">Devel</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8/HighAvailability/x86_64/os/Packages/">HighAvailability</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8/PowerTools/x86_64/os/Packages/">PowerTools</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8/centosplus/x86_64/os/Packages/">centosplus</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8/cloud/x86_64/">cloud</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8/extras/x86_64/os/Packages/">extras</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8/fasttrack/x86_64/os/Packages/">fasttrack</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8/messaging/x86_64/">messaging</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8/openafs/x86_64/Packages/">openafs</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8/sclo/x86_64/">sclo</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8/virt/x86_64/">virt</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8-testing/AppStream/x86_64/os/Packages/">AppStream (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8-testing/BaseOS/x86_64/os/Packages/">BaseOS (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8-testing/CERN/x86_64/Packages/">CERN (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8-testing/Devel/x86_64/os/Packages/">Devel (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8-testing/HighAvailability/x86_64/os/Packages/">HighAvailability (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8-testing/PowerTools/x86_64/os/Packages/">PowerTools (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8-testing/centosplus/x86_64/os/Packages/">centosplus (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8-testing/cloud/x86_64/">cloud (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8-testing/extras/x86_64/os/Packages/">extras (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8-testing/fasttrack/x86_64/os/Packages/">fasttrack (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8-testing/messaging/x86_64/">messaging (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8-testing/openafs/x86_64/Packages/">openafs (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8-testing/sclo/x86_64/">sclo (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/s8-testing/virt/x86_64/">virt (testing)</a>
</ul>
+
<li>CC 7X:
<ul>
<li>for x86_64: <a href="http://linuxsoft.cern.ch/cern/centos/7/centosplus-testing/x86_64/repoview/">centosplus-testing</a> <a href="http://linuxsoft.cern.ch/cern/centos/7/centosplus/x86_64/repoview/">centosplus</a> <a href="http://linuxsoft.cern.ch/cern/centos/7/cern-testing/x86_64/repoview/">cern-testing</a> <a href="http://linuxsoft.cern.ch/cern/centos/7/cern/x86_64/repoview/">cern</a> <a href="http://linuxsoft.cern.ch/cern/centos/7/cr-testing/x86_64/repoview/">cr-testing</a> <a href="http://linuxsoft.cern.ch/cern/centos/7/cr/x86_64/repoview/">cr</a> <a href="http://linuxsoft.cern.ch/cern/centos/7/extras-testing/x86_64/repoview/">extras-testing</a> <a href="http://linuxsoft.cern.ch/cern/centos/7/extras/x86_64/repoview/">extras</a> <a href="http://linuxsoft.cern.ch/cern/centos/7/fasttrack-testing/x86_64/repoview/">fasttrack-testing</a> <a href="http://linuxsoft.cern.ch/cern/centos/7/fasttrack/x86_64/repoview/">fasttrack</a> <a href="http://linuxsoft.cern.ch/cern/centos/7/os/x86_64/repoview/">os</a> <a href="http://linuxsoft.cern.ch/cern/centos/7/rhcommon-testing/x86_64/repoview/">rhcommon-testing</a> <a href="http://linuxsoft.cern.ch/cern/centos/7/rhcommon/x86_64/repoview/">rhcommon</a> <a href="http://linuxsoft.cern.ch/cern/centos/7/rt-testing/x86_64/repoview/">rt-testing</a> <a href="http://linuxsoft.cern.ch/cern/centos/7/rt/x86_64/repoview/">rt</a> <a href="http://linuxsoft.cern.ch/cern/centos/7/updates-testing/x86_64/repoview/">updates-testing</a> <a href="http://linuxsoft.cern.ch/cern/centos/7/updates/x86_64/repoview/">updates</a> <a href="elrepo/elrepo/el7/x86_64/">elrepo</a>
</ul>
+ <li>C 8X:
+ <ul>
+ <li>for x86_64: <a href="http://linuxsoft.cern.ch/cern/centos/8/AppStream/x86_64/os/Packages/">AppStream</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/BaseOS/x86_64/os/Packages/">BaseOS</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/CERN/x86_64/Packages/">CERN</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/Devel/x86_64/os/Packages/">Devel</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/HighAvailability/x86_64/os/Packages/">HighAvailability</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/PowerTools/x86_64/os/Packages/">PowerTools</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/centosplus/x86_64/os/Packages/">centosplus</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/cloud/x86_64/">cloud</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/cr/x86_64/os/Packages/">cr</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/extras/x86_64/os/Packages/">extras</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/fasttrack/x86_64/os/Packages/">fasttrack</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/messaging/x86_64/">messaging</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/openafs/x86_64/Packages/">openafs</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/sclo/">sclo</a> <a href="http://linuxsoft.cern.ch/cern/centos/8/virt/x86_64/">virt</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/AppStream/x86_64/os/Packages/">AppStream (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/BaseOS/x86_64/os/Packages/">BaseOS (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/CERN/x86_64/Packages/">CERN (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/Devel/x86_64/os/Packages/">Devel (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/HighAvailability/x86_64/os/Packages/">HighAvailability (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/PowerTools/x86_64/os/Packages/">PowerTools (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/centosplus/x86_64/os/Packages/">centosplus (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/cloud/x86_64/">cloud (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/cr/x86_64/os/Packages/">cr (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/extras/x86_64/os/Packages/">extras (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/fasttrack/x86_64/os/Packages/">fasttrack (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/messaging/x86_64/">messaging (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/openafs/x86_64/Packages/">openafs (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/sclo/">sclo (testing)</a> <a href="http://linuxsoft.cern.ch/cern/centos/8-testing/virt/x86_64/">virt (testing)</a>
+ </ul>
+
+
+
<li>SLC 6X (and compatible):
<ul>
<li>for x86 (i386): <a href="http://linuxsoft.cern.ch/cern/slc6X/i386/yum/os/repoview/">os</a> <a href="http://linuxsoft.cern.ch/cern/slc6X/i386/yum/updates/repoview/">updates</a> <a href="http://linuxsoft.cern.ch/cern/slc6X/i386/yum/extras/repoview/">extras</a> <a href="http://linuxsoft.cern.ch/cern/slc6X/i386/yum/testing/repoview/">testing</a> <a href="epel/6/i386/repoview/">EPEL</a> <a href="elrepo/elrepo/el6/i386/">elrepo</a> <a href="http://linuxsoft.cern.ch/cern/devtoolset/slc6X/i386/RPMS/repoview">Devtoolset</a>
diff --git a/docs/updates/index.md b/docs/updates/index.md
index 5a8b4024a384c0708fc5b25f19e782cda06d03ae..0f5611aa3472b11af740124c325bd2a0b6342b3e 100644
--- a/docs/updates/index.md
+++ b/docs/updates/index.md
@@ -12,20 +12,8 @@
* [TEST Updates/Errata](/updates/cs8/test/latest_updates)
* [Software repositories](/updates/cs8/)
-## CentOS 8 (C8)
-
-* [Updates/Errata](/updates/c8/prod/latest_updates)
-* [TEST Updates/Errata](/updates/c8/test/latest_updates)
-* [Software repositories](/updates/c8/)
-
## CERN CentOS 7 (CC7)
* [Updates/Errata](/updates/cc7/prod/latest_updates)
* [TEST Updates/Errata](/updates/cc7/test/latest_updates)
* [Software repositories](/updates/cc7/)
-
-## Scientific Linux CERN 6 (SLC6)
-
-* [Updates/Errata](/updates/slc6/prod/latest_updates)
-* [TEST Updates/Errata](/updates/slc6/test/latest_updates)
-* [Software repositories](/updates/slc6/)
diff --git a/mkdocs.yml b/mkdocs.yml
index b5865aa2b395c860c144c9a54626ef477fa779b1..8cc4c8b713d5dbf2f8534e5c194b6f519415189f 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -101,16 +101,15 @@ nav:
- 'Documentation': centos7/docs/index.md
- 'Installation': centos7/docs/install.md
- 'Hardware': centos7/hardware/index.md
- - 'CentOS 8 (C8/CS8)':
- - 'CentOS 8': centos8/index.md
+ - 'CentOS Stream 8 (CS8)':
+ - 'CentOS Stream 8': centos8/index.md
- 'Documentation':
- 'Documentation': centos8/docs/index.md
- 'Installation': centos8/docs/install.md
- 'CentOS Linux 8 to CentOS Stream 8 migration': /centos8/docs/migration/
- - 'Scientific Linux':
- - 'Scientifix Linux': "https://linux-archive.web.cern.ch/scientific/"
- - 'CERN 6 (SLC6)': "https://linux-archive.web.cern.ch/scientific6/"
- - 'Other Linux products': other.md
+ - 'Other Linux products':
+ - 'RedHat Enterprise Linux (RHEL)': rhel/index.md
+ - 'Scientific Linux CERN (SLC6) - (deprecated)': "https://linux-archive.web.cern.ch/scientific/"
- 'Docker images': dockerimages.md
- 'Openstack images': openstack.md
- 'Linux Software Building':