Merge pull request #10 from technicalguru/develop

Merge release from develop branch

Author: technicalguru

CONTRIBUTING.md

@@ -37,6 +37,7 @@ Mailserver is intentionally modular. Its main mail-related functions are separat
 
 * [docker-mailserver](https://github.com/technicalguru/docker-mailserver) - Provides help, guidance and examples how to orchestrate the Docker images
 * [docker-mailserver-postfix](https://github.com/technicalguru/docker-mailserver-postfix) - Implements the core mailing functionality to send and receive messages.
+* [docker-mailserver-opendkim](https://github.com/technicalguru/docker-mailserver-opendkim) - Implements the DKIM signing functionality.
 * [docker-mailserver-postfixadmin](https://github.com/technicalguru/docker-mailserver-postfixadmin) - Provides administration function for domains and mailboxes
 * [docker-mailserver-amavis](https://github.com/technicalguru/docker-mailserver-amavis) - Provides mail scanners to detect viruses and spam
 * [docker-mailserver-roundcube](https://github.com/technicalguru/docker-mailserver-roundcube) - A webmail interface that lets you pick-up, read, manage and send e-mails

Dockerfile

@@ -1,4 +1,4 @@
-FROM eu.gcr.io/long-grin-186810/rs-php:7.4.4-apache-2.4.38.0
+FROM technicalguru/rs-php:7.4.28-apache-2.4.53.1
 LABEL maintainer="Ralph Schuster <github@ralph-schuster.eu>"
 
 RUN apt-get update &&  apt-get update && apt-get install -y --no-install-recommends \
@@ -11,7 +11,8 @@ RUN apt-get update &&  apt-get update && apt-get install -y --no-install-recomme
 #ADD etc/sites/ /etc/apache2/sites-enabled/
 RUN chown -R www-data:www-data /var/www/html
 
-ENV PFA_VERSION="3.2.4"
+ENV PFA_VERSION="3.3.11"
+ENV PFA_REVISION="0"
 ENV PFA_URL="https://github.com/postfixadmin/postfixadmin/archive/postfixadmin-${PFA_VERSION}.tar.gz"
 RUN set -xe \
     && cd /var/www/html \
@@ -21,7 +22,7 @@ RUN set -xe \
     && mkdir templates_c 
 
 ADD src/    /var/www/html/
-RUN patch model/MailboxHandler.php < MailboxHandler.php.patch
+#RUN patch model/MailboxHandler.php < MailboxHandler.php.patch
 
 RUN chown -R www-data:www-data .
 
@@ -31,8 +32,8 @@ RUN chown -R www-data:www-data .
 ARG ARG_CREATED
 ARG ARG_URL=https://github.com/technicalguru/docker-mailserver-postfixadmin
 ARG ARG_SOURCE=https://github.com/technicalguru/docker-mailserver-postfixadmin
-ARG ARG_VERSION="${PFA_VERSION}-01"
-ARG ARG_REVISION
+ARG ARG_VERSION="${PFA_VERSION}.${PFA_REVISION}"
+ARG ARG_REVISION="${PFA_REVISION}"
 ARG ARG_VENDOR=technicalguru
 ARG ARG_TITLE=technicalguru/mailserver-postfixadmin
 ARG ARG_DESCRIPTION="Provides PostfixAdmin Web UI with Apache/PHP"

README.md

@@ -6,13 +6,15 @@ without the other components. However, a database server is always required to s
 Related images:
 * [docker-mailserver](https://github.com/technicalguru/docker-mailserver) - The main project, containing composition instructions
 * [docker-mailserver-postfix](https://github.com/technicalguru/docker-mailserver-postfix) - Postfix/Dovecot image (mailserver component)
+* [docker-mailserver-opendkim](https://github.com/technicalguru/docker-mailserver-opendkim) - OpenDKIM image (DKIM signing milter component)
 * [docker-mailserver-amavis](https://github.com/technicalguru/docker-mailserver-amavis) - Amavis, ClamAV and SpamAssassin (provides spam and virus detection)
 * [docker-mailserver-roundcube](https://github.com/technicalguru/docker-mailserver-roundcube) - Roundcube Webmailer
 
 # Tags
 The following versions are available from DockerHub. The image tag matches the PostfixAdmin version.
 
-* [3.2.4-01, 3.2.4, 3.2, 3, latest](https://hub.docker.com/repository/docker/technicalguru/mailserver-postfixadmin) - [Dockerfile](https://github.com/technicalguru/docker-mailserver-postfixadmin/blob/3.2.4-01/Dockerfile)
+* [3.3.11.1, 3.3.11, 3.3, 3, latest](https://hub.docker.com/repository/docker/technicalguru/mailserver-postfixadmin/tree/v3.3.11.1) - [Dockerfile](https://github.com/technicalguru/docker-mailserver-postfixadmin/blob/3.3.11.1/Dockerfile)
+* [3.2.4-01, 3.2.4, 3.2](https://hub.docker.com/repository/docker/technicalguru/mailserver-postfixadmin/tree/v3.2.4-01) - [Dockerfile](https://github.com/technicalguru/docker-mailserver-postfixadmin/blob/3.2.4-01/Dockerfile)
 
 # Features
 * Database and PostfixAdmin setup from environment variables
@@ -51,7 +53,7 @@ _docker-mailserver-postfixadmin_  exposes port 80 (the WebUI). No TLS support is
 The [main mailserver project](https://github.com/technicalguru/docker-mailserver) has examples of container configurations:
 * [with docker-compose](https://github.com/technicalguru/docker-mailserver/tree/master/examples/docker-compose)
 * [with Kubernetes YAML files](https://github.com/technicalguru/docker-mailserver/tree/master/examples/kubernetes)
-* [with HELM charts](https://github.com/technicalguru/docker-mailserver/tree/master/helm-charts)
+* [with HELM charts](https://github.com/technicalguru/docker-mailserver/tree/master/examples/helm-charts)
 
 ## Bootstrap and Setup
 Once you have started your PostfixAdmin container successfully, it is now time to perform the first-time setup for your mailserver. Open the web interface and navigate to `/public/setup.php`.

src/config.local.php

@@ -62,7 +62,10 @@
 // To create the hash, visit setup.php in a browser and type a password into the field,
 // on submission it will be echoed out to you as a hashed value.
 $PFA_SALT = md5(time() . '*' . $_SERVER['REMOTE_ADDR'] . '*' . mt_rand(0, 60000));
-$CONF['setup_password'] = $PFA_SALT.':'.sha1($PFA_SALT.':'.($_ENV['PFA_SETUP_PASS'] ? $_ENV['PFA_SETUP_PASS'] : $_ENV['PFA_DB_PASS']));
+# SHA1 encoding is obsolete since 3.3
+#$CONF['setup_password'] = $PFA_SALT.':'.sha1($PFA_SALT.':'.($_ENV['PFA_SETUP_PASS'] ? $_ENV['PFA_SETUP_PASS'] : $_ENV['PFA_DB_PASS']));
+# New password hashing since 3.3
+$CONF['setup_password'] = password_hash(($_ENV['PFA_SETUP_PASS'] ? $_ENV['PFA_SETUP_PASS'] : $_ENV['PFA_DB_PASS']), PASSWORD_DEFAULT);
 
 // Language config
 // Language files are located in './languages', change as required..