certs: minor stylistic improvements

[pmg-docs.git] / pmg-installation.adoc

diff --git a/pmg-installation.adoc b/pmg-installation.adoc
index 6c4254eb6c5432ae60a9e659756289204ef223e2..943ca9d77cb473449d012e6e5e530084945cf539 100644 (file)
--- a/pmg-installation.adoc
+++ b/pmg-installation.adoc
@@ -15,17 +15,18 @@ Alternatively, {pmg} can be installed on top of an existing Debian
 system.  This option is only recommended for advanced users since
 it requires more detailed knowledge about {pmg} and Debian.
 
+include::pmg-installation-media.adoc[]
+
 [[pmg_install_iso]]
 Using the {pmg} Installation CD-ROM
 -----------------------------------
 
-You can download the ISO from https://www.proxmox.com. It includes the
-following:
+The installer ISO image includes the following:
 
 * Complete operating system (Debian Linux, 64-bit)
 
 * The {pmg} installer, which partitions the hard drive(s) with ext4,
-  ext3, xfs or ZFS and installs the operating system.
+  xfs or ZFS and installs the operating system.
 
 * Linux kernel
 
@@ -33,12 +34,16 @@ following:
 
 * Web-based management interface for using the toolset
 
-Please burn the downloaded ISO image to a CD or create a
-xref:installation_prepare_media[bootable USB flash drive].
 
-Then insert the installation CD-ROM on the physical host where you want
-to install {pmg} and boot from that drive. Afterwards you
-can choose the following menu options:
+
+Please insert the xref:installation_prepare_media[prepared installation media]
+(for example, USB flash drive or CD-ROM) and boot from it.
+
+TIP: Make sure that booting from the installation medium (for example, USB) is
+enabled in your servers firmware settings.
+
+After choosing the correct entry (e.g. Boot from USB) the {pmg} menu will be
+displayed and one of the following options can be selected:
 
 image::images/installer/pmg-grub-menu.png[]
 
@@ -79,7 +84,7 @@ Make sure there is no important data on the server before proceeding with the
 installation.
 
 The `Options` button lets you select the target file system, which
-defaults to `ext4`. The installer uses LVM if you select `ext3`,
+defaults to `ext4`. The installer uses LVM if you select
 `ext4` or `xfs` as file system, and offers additional option to
 restrict LVM space (see <<advanced_lvm_options,below>>)
 
@@ -218,7 +223,6 @@ the installation using the following command:
 
  zpool add <pool-name> log </dev/path_to_fast_ssd>
 
-include::pmg-installation-media.adoc[]
 
 [[pmg_install_on_debian]]
 Install {pmg} on Debian
@@ -399,3 +403,30 @@ f3f6c5a3a67baf38ad178e5ff1ee270c  /etc/apt/trusted.gpg.d/proxmox-ve-release-6.x.
 ----
 
 
+Other Repository Sources
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+Certain software cannot be made available in the `main` and `contrib`
+areas of the {debian} archives, since it does not adhere to the Debian
+Free Software Guidelines (DFSG). These are distributed in the
+{debian_nonfree_archive_area}. For {pmg} two packages from the `non-free` area
+are needed in order to support the RAR archive format:
+
+* `p7zip-rar` for matching xref:pmg_mailfilter_what[Archive Objects] in the
+  xref:chapter_mailfilter[Rule system]
+
+* `libclamunrar` for detecting viruses in RAR archives.
+
+.Additional sources.list entry for `non-free`
+----
+deb http://deb.debian.org/debian/ buster non-free
+deb http://security.debian.org/debian-security buster/updates non-free
+deb http://deb.debian.org/debian/ buster-updates non-free
+----
+
+Then you can install the required packages with:
+
+----
+apt update
+apt install libclamunrar p7zip-rar
+----