Merge pull request #157 from nupplaphil/bug/fallback_empty_smtp

Activate msmtp just in case there's a config
2024-05-26 03:26:56 +02:00 · 2021-07-11 09:59:07 -04:00 · 2021-07-11 09:59:07 -04:00 · 3aa0b844d1
parent 03f6d4021b 3d49fcaabd
commit 3aa0b844d1
33 changed files with 128 additions and 68 deletions
--- a/2020.09/apache/Dockerfile
+++ b/2020.09/apache/Dockerfile
@ -108,10 +108,6 @@ RUN set -ex; \
        echo 'opcache.revalidte_freq=1'; \
    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
    \
-    { \
-        echo sendmail_path = "/usr/bin/msmtp -t"; \
-    } > /usr/local/etc/php/conf.d/sendmail.ini; \
-    \
    echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
    \
    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
--- a/2020.09/apache/setup_msmtp.sh
+++ b/2020.09/apache/setup_msmtp.sh
@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
    echo "aliases /etc/aliases"
  } >/etc/msmtprc

+  # enable msmtp setup
+  {
+    echo sendmail_path = "/usr/bin/msmtp -t";
+  } > /usr/local/etc/php/conf.d/sendmail.ini
+
+  # reload php-config per signal
+  kill -USR2 1
+
  echo "Setup finished"
 fi
--- a/2020.09/fpm-alpine/Dockerfile
+++ b/2020.09/fpm-alpine/Dockerfile
@ -83,10 +83,6 @@ RUN set -ex; \
        echo 'opcache.revalidte_freq=1'; \
    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
    \
-    { \
-        echo sendmail_path = "/usr/bin/msmtp -t"; \
-    } > /usr/local/etc/php/conf.d/sendmail.ini; \
-    \
    echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
    \
    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
--- a/2020.09/fpm-alpine/setup_msmtp.sh
+++ b/2020.09/fpm-alpine/setup_msmtp.sh
@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
    echo "aliases /etc/aliases"
  } >/etc/msmtprc

+  # enable msmtp setup
+  {
+    echo sendmail_path = "/usr/bin/msmtp -t";
+  } > /usr/local/etc/php/conf.d/sendmail.ini
+
+  # reload php-config per signal
+  kill -USR2 1
+
  echo "Setup finished"
 fi
--- a/2020.09/fpm/Dockerfile
+++ b/2020.09/fpm/Dockerfile
@ -108,10 +108,6 @@ RUN set -ex; \
        echo 'opcache.revalidte_freq=1'; \
    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
    \
-    { \
-        echo sendmail_path = "/usr/bin/msmtp -t"; \
-    } > /usr/local/etc/php/conf.d/sendmail.ini; \
-    \
    echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
    \
    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
--- a/2020.09/fpm/setup_msmtp.sh
+++ b/2020.09/fpm/setup_msmtp.sh
@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
    echo "aliases /etc/aliases"
  } >/etc/msmtprc

+  # enable msmtp setup
+  {
+    echo sendmail_path = "/usr/bin/msmtp -t";
+  } > /usr/local/etc/php/conf.d/sendmail.ini
+
+  # reload php-config per signal
+  kill -USR2 1
+
  echo "Setup finished"
 fi
--- a/2021.01/apache/Dockerfile
+++ b/2021.01/apache/Dockerfile
@ -108,10 +108,6 @@ RUN set -ex; \
        echo 'opcache.revalidte_freq=1'; \
    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
    \
-    { \
-        echo sendmail_path = "/usr/bin/msmtp -t"; \
-    } > /usr/local/etc/php/conf.d/sendmail.ini; \
-    \
    echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
    \
    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
--- a/2021.01/apache/setup_msmtp.sh
+++ b/2021.01/apache/setup_msmtp.sh
@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
    echo "aliases /etc/aliases"
  } >/etc/msmtprc

+  # enable msmtp setup
+  {
+    echo sendmail_path = "/usr/bin/msmtp -t";
+  } > /usr/local/etc/php/conf.d/sendmail.ini
+
+  # reload php-config per signal
+  kill -USR2 1
+
  echo "Setup finished"
 fi
--- a/2021.01/fpm-alpine/Dockerfile
+++ b/2021.01/fpm-alpine/Dockerfile
@ -83,10 +83,6 @@ RUN set -ex; \
        echo 'opcache.revalidte_freq=1'; \
    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
    \
-    { \
-        echo sendmail_path = "/usr/bin/msmtp -t"; \
-    } > /usr/local/etc/php/conf.d/sendmail.ini; \
-    \
    echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
    \
    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
--- a/2021.01/fpm-alpine/setup_msmtp.sh
+++ b/2021.01/fpm-alpine/setup_msmtp.sh
@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
    echo "aliases /etc/aliases"
  } >/etc/msmtprc

+  # enable msmtp setup
+  {
+    echo sendmail_path = "/usr/bin/msmtp -t";
+  } > /usr/local/etc/php/conf.d/sendmail.ini
+
+  # reload php-config per signal
+  kill -USR2 1
+
  echo "Setup finished"
 fi
--- a/2021.01/fpm/Dockerfile
+++ b/2021.01/fpm/Dockerfile
@ -108,10 +108,6 @@ RUN set -ex; \
        echo 'opcache.revalidte_freq=1'; \
    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
    \
-    { \
-        echo sendmail_path = "/usr/bin/msmtp -t"; \
-    } > /usr/local/etc/php/conf.d/sendmail.ini; \
-    \
    echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
    \
    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
--- a/2021.01/fpm/setup_msmtp.sh
+++ b/2021.01/fpm/setup_msmtp.sh
@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
    echo "aliases /etc/aliases"
  } >/etc/msmtprc

+  # enable msmtp setup
+  {
+    echo sendmail_path = "/usr/bin/msmtp -t";
+  } > /usr/local/etc/php/conf.d/sendmail.ini
+
+  # reload php-config per signal
+  kill -USR2 1
+
  echo "Setup finished"
 fi
--- a/2021.04/apache/Dockerfile
+++ b/2021.04/apache/Dockerfile
@ -108,10 +108,6 @@ RUN set -ex; \
        echo 'opcache.revalidte_freq=1'; \
    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
    \
-    { \
-        echo sendmail_path = "/usr/bin/msmtp -t"; \
-    } > /usr/local/etc/php/conf.d/sendmail.ini; \
-    \
    echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
    \
    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
--- a/2021.04/apache/setup_msmtp.sh
+++ b/2021.04/apache/setup_msmtp.sh
@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
    echo "aliases /etc/aliases"
  } >/etc/msmtprc

+  # enable msmtp setup
+  {
+    echo sendmail_path = "/usr/bin/msmtp -t";
+  } > /usr/local/etc/php/conf.d/sendmail.ini
+
+  # reload php-config per signal
+  kill -USR2 1
+
  echo "Setup finished"
 fi
--- a/2021.04/fpm-alpine/Dockerfile
+++ b/2021.04/fpm-alpine/Dockerfile
@ -83,10 +83,6 @@ RUN set -ex; \
        echo 'opcache.revalidte_freq=1'; \
    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
    \
-    { \
-        echo sendmail_path = "/usr/bin/msmtp -t"; \
-    } > /usr/local/etc/php/conf.d/sendmail.ini; \
-    \
    echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
    \
    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
--- a/2021.04/fpm-alpine/setup_msmtp.sh
+++ b/2021.04/fpm-alpine/setup_msmtp.sh
@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
    echo "aliases /etc/aliases"
  } >/etc/msmtprc

+  # enable msmtp setup
+  {
+    echo sendmail_path = "/usr/bin/msmtp -t";
+  } > /usr/local/etc/php/conf.d/sendmail.ini
+
+  # reload php-config per signal
+  kill -USR2 1
+
  echo "Setup finished"
 fi
--- a/2021.04/fpm/Dockerfile
+++ b/2021.04/fpm/Dockerfile
@ -108,10 +108,6 @@ RUN set -ex; \
        echo 'opcache.revalidte_freq=1'; \
    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
    \
-    { \
-        echo sendmail_path = "/usr/bin/msmtp -t"; \
-    } > /usr/local/etc/php/conf.d/sendmail.ini; \
-    \
    echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
    \
    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
--- a/2021.04/fpm/setup_msmtp.sh
+++ b/2021.04/fpm/setup_msmtp.sh
@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
    echo "aliases /etc/aliases"
  } >/etc/msmtprc

+  # enable msmtp setup
+  {
+    echo sendmail_path = "/usr/bin/msmtp -t";
+  } > /usr/local/etc/php/conf.d/sendmail.ini
+
+  # reload php-config per signal
+  kill -USR2 1
+
  echo "Setup finished"
 fi
--- a/2021.07/apache/Dockerfile
+++ b/2021.07/apache/Dockerfile
@ -108,10 +108,6 @@ RUN set -ex; \
        echo 'opcache.revalidte_freq=1'; \
    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
    \
-    { \
-        echo sendmail_path = "/usr/bin/msmtp -t"; \
-    } > /usr/local/etc/php/conf.d/sendmail.ini; \
-    \
    echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
    \
    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
--- a/2021.07/apache/setup_msmtp.sh
+++ b/2021.07/apache/setup_msmtp.sh
@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
    echo "aliases /etc/aliases"
  } >/etc/msmtprc

+  # enable msmtp setup
+  {
+    echo sendmail_path = "/usr/bin/msmtp -t";
+  } > /usr/local/etc/php/conf.d/sendmail.ini
+
+  # reload php-config per signal
+  kill -USR2 1
+
  echo "Setup finished"
 fi
--- a/2021.07/fpm-alpine/Dockerfile
+++ b/2021.07/fpm-alpine/Dockerfile
@ -83,10 +83,6 @@ RUN set -ex; \
        echo 'opcache.revalidte_freq=1'; \
    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
    \
-    { \
-        echo sendmail_path = "/usr/bin/msmtp -t"; \
-    } > /usr/local/etc/php/conf.d/sendmail.ini; \
-    \
    echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
    \
    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
--- a/2021.07/fpm-alpine/setup_msmtp.sh
+++ b/2021.07/fpm-alpine/setup_msmtp.sh
@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
    echo "aliases /etc/aliases"
  } >/etc/msmtprc

+  # enable msmtp setup
+  {
+    echo sendmail_path = "/usr/bin/msmtp -t";
+  } > /usr/local/etc/php/conf.d/sendmail.ini
+
+  # reload php-config per signal
+  kill -USR2 1
+
  echo "Setup finished"
 fi
--- a/2021.07/fpm/Dockerfile
+++ b/2021.07/fpm/Dockerfile
@ -108,10 +108,6 @@ RUN set -ex; \
        echo 'opcache.revalidte_freq=1'; \
    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
    \
-    { \
-        echo sendmail_path = "/usr/bin/msmtp -t"; \
-    } > /usr/local/etc/php/conf.d/sendmail.ini; \
-    \
    echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
    \
    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
--- a/2021.07/fpm/setup_msmtp.sh
+++ b/2021.07/fpm/setup_msmtp.sh
@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
    echo "aliases /etc/aliases"
  } >/etc/msmtprc

+  # enable msmtp setup
+  {
+    echo sendmail_path = "/usr/bin/msmtp -t";
+  } > /usr/local/etc/php/conf.d/sendmail.ini
+
+  # reload php-config per signal
+  kill -USR2 1
+
  echo "Setup finished"
 fi
--- a/2021.09-dev/apache/Dockerfile
+++ b/2021.09-dev/apache/Dockerfile
@ -108,10 +108,6 @@ RUN set -ex; \
        echo 'opcache.revalidte_freq=1'; \
    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
    \
-    { \
-        echo sendmail_path = "/usr/bin/msmtp -t"; \
-    } > /usr/local/etc/php/conf.d/sendmail.ini; \
-    \
    echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
    \
    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
--- a/2021.09-dev/apache/setup_msmtp.sh
+++ b/2021.09-dev/apache/setup_msmtp.sh
@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
    echo "aliases /etc/aliases"
  } >/etc/msmtprc

+  # enable msmtp setup
+  {
+    echo sendmail_path = "/usr/bin/msmtp -t";
+  } > /usr/local/etc/php/conf.d/sendmail.ini
+
+  # reload php-config per signal
+  kill -USR2 1
+
  echo "Setup finished"
 fi
--- a/2021.09-dev/fpm-alpine/Dockerfile
+++ b/2021.09-dev/fpm-alpine/Dockerfile
@ -83,10 +83,6 @@ RUN set -ex; \
        echo 'opcache.revalidte_freq=1'; \
    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
    \
-    { \
-        echo sendmail_path = "/usr/bin/msmtp -t"; \
-    } > /usr/local/etc/php/conf.d/sendmail.ini; \
-    \
    echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
    \
    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
--- a/2021.09-dev/fpm-alpine/setup_msmtp.sh
+++ b/2021.09-dev/fpm-alpine/setup_msmtp.sh
@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
    echo "aliases /etc/aliases"
  } >/etc/msmtprc

+  # enable msmtp setup
+  {
+    echo sendmail_path = "/usr/bin/msmtp -t";
+  } > /usr/local/etc/php/conf.d/sendmail.ini
+
+  # reload php-config per signal
+  kill -USR2 1
+
  echo "Setup finished"
 fi
--- a/2021.09-dev/fpm/Dockerfile
+++ b/2021.09-dev/fpm/Dockerfile
@ -108,10 +108,6 @@ RUN set -ex; \
        echo 'opcache.revalidte_freq=1'; \
    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
    \
-    { \
-        echo sendmail_path = "/usr/bin/msmtp -t"; \
-    } > /usr/local/etc/php/conf.d/sendmail.ini; \
-    \
    echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
    \
    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
--- a/2021.09-dev/fpm/setup_msmtp.sh
+++ b/2021.09-dev/fpm/setup_msmtp.sh
@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
    echo "aliases /etc/aliases"
  } >/etc/msmtprc

+  # enable msmtp setup
+  {
+    echo sendmail_path = "/usr/bin/msmtp -t";
+  } > /usr/local/etc/php/conf.d/sendmail.ini
+
+  # reload php-config per signal
+  kill -USR2 1
+
  echo "Setup finished"
 fi
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@ -82,10 +82,6 @@ RUN set -ex; \
        echo 'opcache.revalidte_freq=1'; \
    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
    \
-    { \
-        echo sendmail_path = "/usr/bin/msmtp -t"; \
-    } > /usr/local/etc/php/conf.d/sendmail.ini; \
-    \
    echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
    \
    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@ -107,10 +107,6 @@ RUN set -ex; \
        echo 'opcache.revalidte_freq=1'; \
    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
    \
-    { \
-        echo sendmail_path = "/usr/bin/msmtp -t"; \
-    } > /usr/local/etc/php/conf.d/sendmail.ini; \
-    \
    echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
    \
    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
--- a/docker-setup_msmtp.sh
+++ b/docker-setup_msmtp.sh
@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
    echo "aliases /etc/aliases"
  } >/etc/msmtprc

+  # enable msmtp setup
+  {
+    echo sendmail_path = "/usr/bin/msmtp -t";
+  } > /usr/local/etc/php/conf.d/sendmail.ini
+
+  # reload php-config per signal
+  kill -USR2 1
+
  echo "Setup finished"
 fi