Revert "Activate msmtp just in case there's a config"

This reverts commit 3d49fcaabd.
2024-11-05 14:31:53 +01:00 · 2021-08-28 20:54:48 +02:00 · 2021-08-28 20:54:48 +02:00 · 7661882be8
parent b8c192e711
commit 7661882be8
33 changed files with 68 additions and 128 deletions
--- a/2020.09/apache/Dockerfile
+++ b/2020.09/apache/Dockerfile
@ -108,6 +108,10 @@ 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,13 +34,5 @@ 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,6 +83,10 @@ 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,13 +34,5 @@ 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,6 +108,10 @@ 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,13 +34,5 @@ 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,6 +108,10 @@ 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,13 +34,5 @@ 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,6 +83,10 @@ 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,13 +34,5 @@ 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,6 +108,10 @@ 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,13 +34,5 @@ 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,6 +108,10 @@ 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,13 +34,5 @@ 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,6 +83,10 @@ 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,13 +34,5 @@ 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,6 +108,10 @@ 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,13 +34,5 @@ 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,6 +108,10 @@ 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,13 +34,5 @@ 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,6 +83,10 @@ 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,13 +34,5 @@ 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,6 +108,10 @@ 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,13 +34,5 @@ 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,6 +108,10 @@ 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,13 +34,5 @@ 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,6 +83,10 @@ 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,13 +34,5 @@ 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,6 +108,10 @@ 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,13 +34,5 @@ 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,6 +82,10 @@ 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,6 +107,10 @@ 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,13 +34,5 @@ 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