cleanup

_toc.yml

@@ -26,10 +26,6 @@ chapters:
 
   - file: admin-guide/index
     sections:
-      - file: admin-guide/architecture
-        sections:
-          - file: admin-guide/architecture/accounts-and-groups
-          - file: admin-guide/architecture/active-directory
       - file: admin-guide/configuration
         sections:
           - file: admin-guide/configuration/icinga2
@@ -64,10 +60,7 @@ chapters:
           - file: admin-guide/configuration/citrix_vda
           - file: admin-guide/configuration/configuration_email
           - file: admin-guide/configuration/selinux_configuration
-      - file: admin-guide/container/index
-        sections:
-          - file: admin-guide/container/docker
-          - file: admin-guide/container/podman 
+      - file: admin-guide/container
       - file: admin-guide/deployment
         sections:
           - file: admin-guide/deployment/sample
@@ -96,6 +89,8 @@ chapters:
               - glob: admin-guide/puppet/components/*
           - file: admin-guide/puppet/development
       - file: admin-guide/selinux
+      - file: admin-guide/accounts-and-groups
+      - file: admin-guide/active-directory
       - file: admin-guide/updates
       - file: admin-guide/mgmt-tools
         sections:
@@ -109,7 +104,6 @@ chapters:
           - file: admin-guide/operations/deployment
           - file: admin-guide/operations/ip-address-change
           - file: admin-guide/operations/version-control
-      - file: admin-guide/third-party
       - file: admin-guide/troubleshooting
         sections:
           - file: admin-guide/troubleshooting/methods-and-tools

admin-guide/container.md

@@ -0,0 +1,23 @@
+# Container
+
+```{warning}
+There are two container runtimes supported by us, but only one by Redhat. If you want to use Redhat third level support you'd have to use Podman. Be aware that compose files and run commands can vary between docker-ce and podman!
+```
+
+
+## Docker
+Docker-CE will have always the latest features in docker engine and docker compose.
+The docker repo is enabled by default and the packages can be installed by using follwing code in hiera.
+```
+base::pkg_group::extra:
+  - 'docker-ce' 
+```
+
+## Podman
+Podman engine runs "rootless" without any further configuration and is supported by Redhat Enterprise Support.
+The Hiera configuration to install docker-podman with hiera would look like this:
+```
+base::pkg_group::extra:
+  - 'docker' 
+```
+This will install podman from the appstream repository.

admin-guide/container/docker.md

@@ -1,26 +0,0 @@
-# Docker
-
-##  Disclaimer
-There are two container runtimes supported by us, but only one by Redhat. If you want to use Redhat third level support you'd have to use Podman.
-Be aware that compose files and run commands can vary between docker-ce and podman!
-
-## Docker
-Docker-CE will have always the latest features in docker engine and docker compose.
-The docker repo is enabled by default and the packages can be installed by using follwing code in hiera.
-```
-base::pkg_group::extra:
-  - 'docker-ce' 
-```
-
-## Desktop Systems
-
-Up to now the desktop/console setup (i.e. installing the yum group "@Server with GUI") installes podman by default (via the yum group "@Container Management")
-Until this is fixed (see merge request: https://git.psi.ch/linux-infra/puppet/-/merge_requests/1256)
-following exclude statement must be included in hiera:
-
-```
-base::package_exclude:
-  - 'podman'
-  - 'cockpit-podman'
-  - 'buildah'
-```

admin-guide/container/index.md

@@ -1,6 +0,0 @@
-# Container
-
-Contents:
-
-```{tableofcontents}
-```

admin-guide/container/podman.md

@@ -1,8 +0,0 @@
-# Podman
-Podman engine runs "rootless" without any further configuration and is supported by Redhat Enterprise Support.
-The Hiera configuration to install docker-podman with hiera would look like this:
-```
-base::pkg_group::extra:
-  - 'docker' 
-```
-This will install podman from the appstream repository.

admin-guide/third-party.rst

@@ -1,22 +0,0 @@
-Third-party Documentation
-=========================
-
-.. _bash_style_guides:
-
-
-Style Guides/Coding standards
------------------------------
-
-.. To add a new version to this repository, save as HTML in Firefox and copy to /_static.
- 
-1. The :download:`Google Shell Style Guide <_static/Shell Style Guide.html>`
-   (`original <https://google.github.io/styleguide/shell.xml>`_)
-
-
-Product Documentation
----------------------
-
-1. `Red Hat Enterprise Linux documentation <https://access.redhat.com/documentation/en/red-hat-enterprise-linux/>`_:
-
-  - `Desktop Migration and Administration Guide <https://access.redhat.com/site/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Desktop_Migration_and_Administration_Guide/index.html>`_
-