fix(drone): push branch to github

.drone.yml

@@ -58,9 +58,6 @@ steps:
   volumes:
   - name: docker_socket
     path: /var/run/docker.sock
-  when:
-    branch:
-    - master
 
 - name: push
   image: docker.io/volkerraschek/build-image:latest
@@ -195,7 +192,7 @@ steps:
       cpu: 50
       memory: 25M
   settings:
-    branch: master
+    branch: v3.2.x
     remote: ssh://git@github.com/volker-raschek/postfixadmin-docker.git
     force: true
     ssh_key:

Makefile

@@ -1,5 +1,5 @@
-POSTFIXADMIN_VERSION:=3.3.10
-POSTFIXADMIN_SHA512:=e00fc9ea343a928976d191adfa01020ee0c6ddbe80a39e01ca2ee414a18247958f033970f378fe4a9974636172a5e094e57117ee9ac7b930c592f433097a7aca
+POSTFIXADMIN_VERSION:=3.2.4
+POSTFIXADMIN_SHA512:=2bd7ae05addbaf3c6c7eebea16ec1e21b2c67c8e6161446ed82a9553c26c04e19c1ec9ce248a9b9df504df56d309590259e6f04907b04b593548028b40e40d47
 
 # CONTAINER_RUNTIME
 # The CONTAINER_RUNTIME variable will be used to specified the path to a

README.md

@@ -23,26 +23,31 @@ prefix `POSTFIXADMIN_`. You can take an example
 [configuration](https://github.com/postfixadmin/postfixadmin/blob/master/config.inc.php)
 from the upstream project.
 
-| name                                | default                     |
-| ----------------------------------- | --------------------------- |
-| `POSTFIXADMIN_ADMIN_EMAIL`          |                             |
-| `POSTFIXADMIN_ADMIN_SMTP_PASSWORD`  |                             |
-| `POSTFIXADMIN_ADMIN_NAME`           |                             |
-| `POSTFIXADMIN_DATABASE_TYPE`        | `sqlite`                    |
-| `POSTFIXADMIN_DATABASE_USER`        |                             |
-| `POSTFIXADMIN_DATABASE_PASSWORD`    |                             |
-| `POSTFIXADMIN_DATABASE_HOST`        |                             |
-| `POSTFIXADMIN_DATABASE_PORT`        |                             |
-| `POSTFIXADMIN_DATABASE_NAME`        | `/var/tmp/postfixadmin.db`  |
-| `POSTFIXADMIN_DEFAULT_LANGUAGE`     | `en`                        |
-| `POSTFIXADMIN_DATABASE_USE_SSL`     |                             |
-| `POSTFIXADMIN_DATABASE_KEY`         |                             |
-| `POSTFIXADMIN_DATABASE_CERT`        |                             |
-| `POSTFIXADMIN_DATABASE_CA`          |                             |
-| `POSTFIXADMIN_DATABASE_PREFIX`      |                             |
-| `POSTFIXADMIN_ENCRYPT`              | `md5crypt`                  |
-| `POSTFIXADMIN_SMTP_SERVER`          | `localhost`                 |
-| `POSTFIXADMIN_SMTP_PORT`            | `25`                        |
+| name                                | default                                     |
+| ----------------------------------- | ------------------------------------------- |
+| `POSTFIXADMIN_ADMIN_EMAIL`          |                                             |
+| `POSTFIXADMIN_ADMIN_SMTP_PASSWORD`  |                                             |
+| `POSTFIXADMIN_ADMIN_NAME`           |                                             |
+| `POSTFIXADMIN_DATABASE_TYPE`        | `sqlite`                                    |
+| `POSTFIXADMIN_DATABASE_USER`        |                                             |
+| `POSTFIXADMIN_DATABASE_PASSWORD`    |                                             |
+| `POSTFIXADMIN_DATABASE_HOST`        |                                             |
+| `POSTFIXADMIN_DATABASE_PORT`        |                                             |
+| `POSTFIXADMIN_DATABASE_NAME`        | `/var/tmp/postfixadmin.db`                  |
+| `POSTFIXADMIN_DEFAULT_LANGUAGE`     | `en`                                        |
+| `POSTFIXADMIN_DATABASE_USE_SSL`     |                                             |
+| `POSTFIXADMIN_DATABASE_KEY`         |                                             |
+| `POSTFIXADMIN_DATABASE_CERT`        |                                             |
+| `POSTFIXADMIN_DATABASE_CA`          |                                             |
+| `POSTFIXADMIN_DATABASE_PREFIX`      |                                             |
+| `POSTFIXADMIN_ENCRYPT`              | `md5crypt`                                  |
+| `POSTFIXADMIN_SMTP_SERVER`          | `localhost`                                 |
+| `POSTFIXADMIN_SMTP_PORT`            | `25`                                        |
+| `POSTFIXADMIN_SMTP_CLIENT`          |                                             |
+| `POSTFIXADMIN_SHOW_FOOTER_TEXT`     | `YES`                                       |
+| `POSTFIXADMIN_FOOTER_TEXT`          | `Return to change-this-to-your.domain.tld`  |
+| `POSTFIXADMIN_FOOTER_LINK`          | `http://change-this-to-your.domain.tld`     |
+| `POSTFIXADMIN_FETCHMAIL`            | `YES`                                       |
 
 ### POSTFIXADMIN_ADMIN_EMAIL
 
@@ -175,3 +180,32 @@ are documented
 To login into the `setup.php` page is the setup password required. This can be
 defined via the variable `POSTFIXADMIN_SETUP_PASSWORD`. The password will not be
 configured in the `config.local.php` as plain text. It will be encrypted.
+
+### POSTFIXADMIN_SMTP_CLIENT
+
+Hostname (FQDN) of the server hosting PostfixAdmin used in the `HELO` when
+sending emails from PostfixAdmin. The value of the environment will be
+configured as the following config setting: `$CONF['smtp_server']` and is empty
+by default.
+
+### POSTFIXADMIN_SMTP_SERVER
+
+Hostname (FQDN) of your mail server. The default value is `localhost`. The value
+of the environment will be configured as the following config setting:
+`$CONF['smtp_server']`.
+
+### POSTFIXADMIN_SMTP_PORT
+
+Port of your mail server. The default value is `25`. The value of the
+environment will be configured as the following config setting:
+`$CONF['smtp_port']`.
+
+### POSTFIXADMIN_SHOW_FOOTER_TEXT
+
+Enable or disable via `YES` or `NO` the footer text displayed on all sites. Use
+`POSTFIXADMIN_FOOTER_TEXT` and `POSTFIX_FOOTER_LINK` to customize the text.
+
+### POSTFIXADMIN_FETCHMAIL
+
+Enable or disable via `YES` or `NO` the fetchmail tab. It has nothing todo with
+the fetchmail cron job.