From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id AD7689715F for ; Mon, 4 Mar 2024 14:22:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8C4F6173FD for ; Mon, 4 Mar 2024 14:22:08 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 4 Mar 2024 14:22:07 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 0B707487B6 for ; Mon, 4 Mar 2024 14:22:07 +0100 (CET) From: Christoph Heiss To: pmg-devel@lists.proxmox.com Date: Mon, 4 Mar 2024 14:21:51 +0100 Message-ID: <20240304132159.899727-5-c.heiss@proxmox.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240304132159.899727-1-c.heiss@proxmox.com> References: <20240304132159.899727-1-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.005 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pmg-devel] [PATCH docs 4/8] installation: repos: improve & align wording with pve-docs X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Mar 2024 13:22:38 -0000 Most of the changes are taken from pve-docs to align the exact wording in general, as well as changing a few subtle things to improve the overall reading flow. The equivalent changes will be done for pve-docs too to ensure they are really the same in the end. Signed-off-by: Christoph Heiss --- pmg-installation.adoc | 53 +++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/pmg-installation.adoc b/pmg-installation.adoc index ac6a9af..8cac842 100644 --- a/pmg-installation.adoc +++ b/pmg-installation.adoc @@ -348,10 +348,10 @@ used, ensure that the container always leases the same IP, for example, by reserving one with the container's network MAC address. Additionally, you can install this on top of a container-based Debian -installation. After configuring the -xref:pmg_package_repositories[package repositories], you need to run: +installation. +xref:pmg_package_repositories[After configuring the repositories], you need to +run: -[source,bash] ---- apt update apt install proxmox-mailgateway-container @@ -427,19 +427,19 @@ enabled by default: deb https://enterprise.proxmox.com/debian/pmg bookworm pmg-enterprise ---- -As soon as updates are available, the `root@pam` user is notified via -email about the newly available packages. From the GUI, the change-log of -each package can be viewed (if available), showing all details of the -update. Thus, you will never miss important security fixes. +As soon as updates are available, the `root@pam` user is notified via email +about the newly available packages. From the GUI, the 'Changelog' button in the +GUI can be used to see more details about the selected update. +Thus, you will never miss important security fixes. -Please note that you need a valid subscription key to access this -repository. We offer different support levels, which you can find further -details about at {pricing-url}. +Please note that you need a valid subscription key to access the +`pmg-enterprise` repository. We offer different support levels, which you can +find further details about at {pricing-url}. -NOTE: You can disable this repository by commenting out the above line -using a `#` (at the start of the line). This prevents error messages, -if you do not have a subscription key. Please configure the -`pmg-no-subscription` repository in this case. +NOTE: You can disable this repository by commenting out the above line using a +`#` (at the start of the line). This prevents error messages if your host does +not have a subscription key. Please configure the `pmg-no-subscription` +repository in that case. {pmg} No-Subscription Repository @@ -469,30 +469,29 @@ deb http://download.proxmox.com/debian/pmg bookworm pmg-no-subscription {pmg} Test Repository ~~~~~~~~~~~~~~~~~~~~~ -Finally, there is a repository called `pmgtest`. This contains the -latest packages, and is heavily used by developers to test new -features. As with before, you can configure this using -`/etc/apt/sources.list` by adding the following line: +This repository contains the latest packages and is primarily used by developers +to test new features. To configure it, add the following line to +`/etc/apt/sources.list`: .sources.list entry for `pmgtest` ---- deb http://download.proxmox.com/debian/pmg bookworm pmgtest ---- -WARNING: the `pmgtest` repository should only be used -for testing new features or bug fixes. - +WARNING: The `pmgtest` repository should (as the name implies) only be used for +testing new features or bug fixes. SecureApt ~~~~~~~~~ -We use GnuPG to sign the `Release` files inside these repositories, -and APT uses these signatures to verify that all packages are from a -trusted source. +The 'Release' files in the repositories are signed with GnuPG. APT is using +these signatures to verify that all packages are from a trusted source. + +If you install {pmg} from an official ISO image, the key for verification is +already installed. -The key used for verification is already installed, if you install from -our installation CD. If you install via another means, you can manually -download the key by executing the following command as root user: +If you install {pmg} on top of Debian, download and install +the key by executing the following commands as `root` user: ---- # wget https://enterprise.proxmox.com/debian/proxmox-release-bookworm.gpg -O /etc/apt/trusted.gpg.d/proxmox-release-bookworm.gpg -- 2.43.0