pmgupgrade.adoc: add binary name to title

[pmg-docs.git] / pmgconfig.adoc

diff --git a/pmgconfig.adoc b/pmgconfig.adoc
index 2a1019e9632184aed8d7ea9fc7188ac08f2bcf61..a248f9ea2dcadd9c2ce82035dd1ae5050a1fd946 100644 (file)
--- a/pmgconfig.adoc
+++ b/pmgconfig.adoc
@@ -446,6 +446,27 @@ in `/etc/pmg/pmg.conf`, using the following configuration keys:
 include::pmg.virusquar-conf-opts.adoc[]
 
 
+Custom SpamAssassin configuration
+---------------------------------
+
+This is only for advanced users. To add or change the Proxmox
+{spamassassin} configuration please login to the console via SSH. Go
+to directory `/etc/mail/spamassasin/`. In this directory there are several
+files (`init.pre`, `local.cf`, ...) – do not change them.
+
+To add your special configuration, you have to create a new file and
+name it `custom.cf` (in this directory), then add your
+configuration there. Be aware to use the {spamassassin}
+syntax, and test with
+
+----
+# spamassassin -D --lint
+----
+
+If you run a cluster, the `custom.cf` file is synchronized from the
+master node to all cluster members.
+
+
 User Management
 ---------------
 
@@ -455,6 +476,8 @@ User management in {pmg} consists of three types of users/accounts:
 Local Users
 ~~~~~~~~~~~
 
+image::images/screenshot/pmg-gui-local-user-config.png[]
+
 Local users are used to manage and audit {pmg}. Those users can login on the
 management web interface.
 
@@ -490,6 +513,8 @@ For details of the fields see xref:pmg_user_configuration_file[user.conf]
 LDAP/Active Directory
 ~~~~~~~~~~~~~~~~~~~~~
 
+image::images/screenshot/pmg-gui-ldap-user-config.png[]
+
 You can specify multiple LDAP/Active Directory profiles, so that you can
 create rules matching those users and groups.
 
@@ -530,6 +555,8 @@ interface. After that, you can create rules targeting LDAP users and groups.
 Fetchmail
 ~~~~~~~~~
 
+image::images/screenshot/pmg-gui-fetchmail-config.png[]
+
 Fetchmail is utility for polling and forwarding e-mails. You can define
 e-mail accounts, which will then be fetched and forwarded to the e-mail
 address you defined.