From 0f5eefc2d1b392706a4f9b0840f04eb2a1103a81 Mon Sep 17 00:00:00 2001 From: J0WI Date: Fri, 10 Nov 2023 16:38:27 +0000 Subject: [PATCH] Run update.sh (#71) --- apache/docker-entrypoint.sh | 5 ++++- fpm-alpine/docker-entrypoint.sh | 5 ++++- fpm/docker-entrypoint.sh | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/apache/docker-entrypoint.sh b/apache/docker-entrypoint.sh index f6cf686..9c6a528 100755 --- a/apache/docker-entrypoint.sh +++ b/apache/docker-entrypoint.sh @@ -35,7 +35,8 @@ POSTFIXADMIN_DB_PASSWORD=$(get_env_value "POSTFIXADMIN_DB_PASSWORD" "") POSTFIXADMIN_SMTP_SERVER=$(get_env_value "POSTFIXADMIN_SMTP_SERVER" "localhost") POSTFIXADMIN_SMTP_PORT=$(get_env_value "POSTFIXADMIN_SMTP_PORT" "25") POSTFIXADMIN_ENCRYPT=$(get_env_value "POSTFIXADMIN_ENCRYPT" "md5crypt") - +POSTFIXADMIN_DKIM=$(get_env_value "POSTFIXADMIN_DKIM" "NO") +POSTFIXADMIN_DKIM_ALL_ADMINS=$(get_env_value "POSTFIXADMIN_DKIM_ALL_ADMINS" "NO") DEFAULT_SETUP_PASSWORD="changeme" POSTFIXADMIN_SETUP_PASSWORD=$(get_env_value "POSTFIXADMIN_SETUP_PASSWORD" "${DEFAULT_SETUP_PASSWORD}") @@ -105,6 +106,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then \$CONF['smtp_port'] = '${POSTFIXADMIN_SMTP_PORT}'; \$CONF['encrypt'] = '${POSTFIXADMIN_ENCRYPT}'; \$CONF['configured'] = true; + \$CONF['dkim'] = '${POSTFIXADMIN_DKIM}'; + \$CONF['dkim_all_admins'] = '${POSTFIXADMIN_DKIM_ALL_ADMINS}'; ?>" | tee config.local.php else echo "WARNING: $PWD/config.local.php already exists." diff --git a/fpm-alpine/docker-entrypoint.sh b/fpm-alpine/docker-entrypoint.sh index b9e7af1..e7d2af7 100755 --- a/fpm-alpine/docker-entrypoint.sh +++ b/fpm-alpine/docker-entrypoint.sh @@ -35,7 +35,8 @@ POSTFIXADMIN_DB_PASSWORD=$(get_env_value "POSTFIXADMIN_DB_PASSWORD" "") POSTFIXADMIN_SMTP_SERVER=$(get_env_value "POSTFIXADMIN_SMTP_SERVER" "localhost") POSTFIXADMIN_SMTP_PORT=$(get_env_value "POSTFIXADMIN_SMTP_PORT" "25") POSTFIXADMIN_ENCRYPT=$(get_env_value "POSTFIXADMIN_ENCRYPT" "md5crypt") - +POSTFIXADMIN_DKIM=$(get_env_value "POSTFIXADMIN_DKIM" "NO") +POSTFIXADMIN_DKIM_ALL_ADMINS=$(get_env_value "POSTFIXADMIN_DKIM_ALL_ADMINS" "NO") DEFAULT_SETUP_PASSWORD="changeme" POSTFIXADMIN_SETUP_PASSWORD=$(get_env_value "POSTFIXADMIN_SETUP_PASSWORD" "${DEFAULT_SETUP_PASSWORD}") @@ -105,6 +106,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then \$CONF['smtp_port'] = '${POSTFIXADMIN_SMTP_PORT}'; \$CONF['encrypt'] = '${POSTFIXADMIN_ENCRYPT}'; \$CONF['configured'] = true; + \$CONF['dkim'] = '${POSTFIXADMIN_DKIM}'; + \$CONF['dkim_all_admins'] = '${POSTFIXADMIN_DKIM_ALL_ADMINS}'; ?>" | tee config.local.php else echo "WARNING: $PWD/config.local.php already exists." diff --git a/fpm/docker-entrypoint.sh b/fpm/docker-entrypoint.sh index f6cf686..9c6a528 100755 --- a/fpm/docker-entrypoint.sh +++ b/fpm/docker-entrypoint.sh @@ -35,7 +35,8 @@ POSTFIXADMIN_DB_PASSWORD=$(get_env_value "POSTFIXADMIN_DB_PASSWORD" "") POSTFIXADMIN_SMTP_SERVER=$(get_env_value "POSTFIXADMIN_SMTP_SERVER" "localhost") POSTFIXADMIN_SMTP_PORT=$(get_env_value "POSTFIXADMIN_SMTP_PORT" "25") POSTFIXADMIN_ENCRYPT=$(get_env_value "POSTFIXADMIN_ENCRYPT" "md5crypt") - +POSTFIXADMIN_DKIM=$(get_env_value "POSTFIXADMIN_DKIM" "NO") +POSTFIXADMIN_DKIM_ALL_ADMINS=$(get_env_value "POSTFIXADMIN_DKIM_ALL_ADMINS" "NO") DEFAULT_SETUP_PASSWORD="changeme" POSTFIXADMIN_SETUP_PASSWORD=$(get_env_value "POSTFIXADMIN_SETUP_PASSWORD" "${DEFAULT_SETUP_PASSWORD}") @@ -105,6 +106,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then \$CONF['smtp_port'] = '${POSTFIXADMIN_SMTP_PORT}'; \$CONF['encrypt'] = '${POSTFIXADMIN_ENCRYPT}'; \$CONF['configured'] = true; + \$CONF['dkim'] = '${POSTFIXADMIN_DKIM}'; + \$CONF['dkim_all_admins'] = '${POSTFIXADMIN_DKIM_ALL_ADMINS}'; ?>" | tee config.local.php else echo "WARNING: $PWD/config.local.php already exists."