diff --git a/Dockerfile b/Dockerfile index eb38eda..7fb1457 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,8 @@ COPY docker/pecl_install /usr/local/bin/pecl_install # Tune PHP RUN sed -e 's/^expose_php = On/expose_php = Off/' /usr/local/etc/php/php.ini-production > /usr/local/etc/php/php.ini -RUN sed -i -e 's#^;sendmail_path =#sendmail_path = "/usr/bin/msmtp -t"#' -e 's#^memory_limit = 128M#memory_limit = 256M#' /usr/local/etc/php/php.ini +RUN sed -i -e 's#^;sendmail_path =#sendmail_path = "/usr/bin/msmtp -t"#' /usr/local/etc/php/php.ini +RUN sed -i -e 's#^memory_limit = 128M#memory_limit = 256M#' /usr/local/etc/php/php.ini RUN adduser -g "Hosting Admin User" -u 1000 -G www-data -h /var/www/html -HD lamp # Base @@ -38,6 +39,7 @@ RUN apk add --no-cache libjpeg libgd libpng freetype freetype-dev zlib-dev libpn RUN curl -4 https://getcomposer.org/installer|php -- --install-dir=/usr/local/bin --filename=composer ENV COMPOSER_HOME=/var/cache/composer +COPY msmtprc /etc/ COPY docker/www.conf /usr/local/etc/php-fpm.d/ COPY docker/nginx-app.conf /etc/nginx/http.d/default.conf diff --git a/msmtprc b/msmtprc index 505acf3..5c1169e 100644 --- a/msmtprc +++ b/msmtprc @@ -1,18 +1,26 @@ # A system wide configuration file is optional. +defaults +port 25 +tls off + # If it exists, it usually defines a default account. # This allows msmtp to be used like /usr/sbin/sendmail. account default +# Authentication +auth off + # The SMTP smarthost host smtp # Envelope-from address -#from user@example.com -domain example.com +from wordpress@%H + +# Sets the argument of the SMTP EHLO +domain wordpress # Construct envelope-from addresses of the form "user@oursite.example" -#auto_from on -#maildomain example.com +#allow_from_override on # Syslog logging with facility LOG_MAIL instead of the default LOG_USER syslog LOG_MAIL