reshuffling

_toc.yml

@@ -30,10 +30,10 @@ chapters:
       - file: admin-guide/deployment
         sections:
           - file: admin-guide/deployment/basic_installation
-          - file: admin-guide/deployment/reinstall
-          - file: admin-guide/deployment/partitioning
-          - file: admin-guide/deployment/consoles
-          - file: admin-guide/deployment/dmz
+          - file: admin-guide/deployment/re_installation
+          - file: admin-guide/deployment/console_installation
+          - file: admin-guide/deployment/dmz_installation
+          
       - file: admin-guide/configuration
         sections:
           - file: admin-guide/configuration/icinga2

admin-guide/deployment/basic_installation.md

@@ -79,4 +79,14 @@ bob node set-attr lx-test-02.psi.ch kernel_cmdline=inst.dd=https://linuxsoft.cer
 
 #### Custom Partitioning
 
-Please check out the [Partitioning page](partitioning).
+Partitions system are configured with a standard schema using LVM, so that they can be possibly changed afterwards.
+
+By default the whole space available on the first block device is used and any existing partition is removed.
+
+Alternatively you might set the sysdb attribute `system_disk` with the device name of the disk which should be used instead::
+
+```bash
+bob node set-attr $FQDN system_disk=md126
+```
+
+It is also possible to customize the partitioning by using the `partitions` attribute on sysdb. See https://git.psi.ch/linux-infra/bob for more details.

admin-guide/deployment/console_installation.md

@@ -1,4 +1,4 @@
-# Console Deployment
+# Console Installation
 
 ## Overview
 A console is a multi user system (ideally running on standard hardware) with a graphical desktop. The individual users do not have admin rights on the system and all configuration and packages must be deployed by puppet (ensuring reproducibility and fast re-installation in case of hardware failures, etc.)

admin-guide/deployment/dmz_installation.md

@@ -1,4 +1,4 @@
-# DMZ Deployment
+# DMZ Installation
 
 The deployment in the DMZ ist the basically the same as [internaly](basic_installation), but there are a few points to consider:
 

admin-guide/deployment/partitioning.md

@@ -1,38 +0,0 @@
-# Partitioning
-
-Partitions system are configured with a standard schema using LVM, so that they can be possibly changed afterwards.
-
-By default the whole space available on the first block device is used and any existing partition is removed.
-
-Alternatively you might set the sysdb attribute `system_disk` with the device name of the disk which should be used instead::
-
-```bash
-bob node set-attr $FQDN system_disk=md126
-```
-
-It is also possible to customize the partitioning by using the `partitions` attribute on sysdb. See https://git.psi.ch/linux-infra/bob for more details.
-
-
-## RHEL7
-The default partition schema for RHEL7 is:
-
-- create one primary ``/boot`` partition of 1Gb;
-- create the ``vg_root`` Volume Group that uses the rest of the disk;
-- on ``vg_root`` create the following logical volumes:
-    - ``lv_root`` of 12 Gb size for ``/root``;
-    - ``lv_var`` of 8 Gb size for ``/var``;
-    - ``lv_var_log`` of 2 Gb size for ``/var/log``;
-    - ``lv_tmp`` of 2 Gb size for ``/tmp``.
-
-## RHEL8
-The default partition schema for RHEL8 is:
-
-- create one primary ``/boot`` partition of 1Gb;
-- create the ``vg_root`` Volume Group that uses the rest of the disk;
-- on ``vg_root`` create the following logical volumes:
-    - ``lv_root`` of 14 Gb size for ``/root``;
-    - ``lv_home`` of 2 Gb size for ``/home``;
-    - ``lv_var`` of 8 Gb size for ``/var``;
-    - ``lv_var_log`` of 3 Gb size for ``/var/log``;
-    - ``lv_var_tmp`` of 2 Gb size for ``/var/log``;
-    - ``lv_tmp`` of 2 Gb size for ``/tmp``.

admin-guide/deployment/re_installation.md

@@ -1,4 +1,4 @@
-# Reinstallation
+# Re-Installation
 
 
 

rhel8/index.md

@@ -22,6 +22,19 @@ Bugs and issues can be reported in the [Linux project in JIRA](https://jira.psi.
 * [Hardware Compatibility](hardware_compatibility)
 * [Vendor Documentation](vendor_documentation)
 
+## Disk Layout
+The default partition schema for RHEL8 is:
+
+- create one primary ``/boot`` partition of 1Gb;
+- create the ``vg_root`` Volume Group that uses the rest of the disk;
+- on ``vg_root`` create the following logical volumes:
+    - ``lv_root`` of 14 Gb size for ``/root``;
+    - ``lv_home`` of 2 Gb size for ``/home``;
+    - ``lv_var`` of 8 Gb size for ``/var``;
+    - ``lv_var_log`` of 3 Gb size for ``/var/log``;
+    - ``lv_var_tmp`` of 2 Gb size for ``/var/log``;
+    - ``lv_tmp`` of 2 Gb size for ``/tmp``.
+
 ## Caveats
 
 ### Missing or Replaced Packages