diff --git a/.env.sample b/.env.sample index 54d5e7aa3d23454778d5a188d0a92701d285db97..f98f4c9984eaec15c5c00b5694c98dac7372644e 100644 --- a/.env.sample +++ b/.env.sample @@ -8,3 +8,6 @@ DB_DATABASE=wordpress DEBUG=0 DB_PREFIX=wp_ TZ=Europe/Paris +REMOTES=postfix +MAIL_DOMAIN=my.fqdn +MAIL_FROM=user@my.fqdn diff --git a/docker-compose.yml b/docker-compose.yml index aea259b3e89aee3b1c91337c2e4eafcfae0a14c8..33c8410c621e7cc0d0bf8ea9e3656fcde77b113b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,9 @@ services: build: docker/ restart: always environment: + REMOTES: + MAIL_DOMAIN: + MAIL_FROM: TZ: ${TZ} WORDPRESS_DB_HOST: db WORDPRESS_DB_USER: ${DB_USERNAME} diff --git a/docker/Dockerfile b/docker/Dockerfile index fb302572672dff448ca8a4c06812fb5fbe17a837..c72825b28a06606db7b5b18783a074ea2173b697 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,8 +1,10 @@ -FROM wordpress:php7.4 -RUN apt-get update && apt-get install -y libldap2-dev rsyslog +FROM wordpress:latest +ENV DEBIAN_FRONTEND noninteractive +RUN apt-get update && apt-get install -y libldap2-dev rsyslog nullmailer #RUN docker-php-ext-install ldap RUN docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ && docker-php-ext-install ldap -RUN sed -i 's@\(</VirtualHost>\)@Alias /bulletins-specif /var/www/bulletins-specif\n\1@' /etc/apache2/sites-available/000-default.conf +#RUN sed -i 's@\(</VirtualHost>\)@Alias /bulletins-specif /var/www/bulletins-specif\n\1@' /etc/apache2/sites-available/000-default.conf COPY entrypoint.sh /entrypoint.sh +COPY custom.ini $PHP_INI_DIR/conf.d/ RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/docker/custom.ini b/docker/custom.ini new file mode 100644 index 0000000000000000000000000000000000000000..94b400532e27ebae6766d9d9f4cfaf3a6391f5fa --- /dev/null +++ b/docker/custom.ini @@ -0,0 +1,2 @@ +upload_max_filesize=10M +post_max_size=10M diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index d1d50c259c46ab60bcc6536eb1384ad581df0fa3..d8679cf565da9d0715b15b60b0ed1872b1d3d8b3 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -1,5 +1,19 @@ #!/bin/bash /etc/init.d/rsyslog start +### Init nullmailer +chown mail /var/spool/nullmailer +[[ $(ls -A /var/spool/nullmailer | grep -v placeholder) ]] || cp -a /var/spool/nullmailer.orig/* /var/spool/nullmailer/ +if [ ! -p /var/spool/nullmailer/trigger ]; then + rm -f /var/spool/nullmailer/trigger + mkfifo /var/spool/nullmailer/trigger +fi +chown mail:root /var/spool/nullmailer/trigger +chmod 0622 /var/spool/nullmailer/trigger +echo "$REMOTES" > /etc/nullmailer/remotes +echo "$MAIL_DOMAIN" > /etc/nullmailer/defaultdomain +echo "sendmail_from='$MAIL_FROM'" >> $PHP_INI_DIR/conf.d/custom.ini +/usr/sbin/nullmailer-send 2>&1 & + mkdir -p /var/log/apache2 chown -R 33:33 /var/log/apache2 apache2ctl -DFOREGROUND diff --git a/sif.yml b/sif.yml new file mode 100644 index 0000000000000000000000000000000000000000..505eb38bc1b92d9514ee5cfdba748343a93a9de5 --- /dev/null +++ b/sif.yml @@ -0,0 +1,22 @@ +version: "3.0" + +services: + + wordpress: + networks: + - default + - ldap + - traefik + - sympa_postfix + volumes: + - "${WP_PATH}:/var/www/html/" + - "./log:/var/log" + + +networks: + traefik: + external: true + ldap: + external: true + sympa_postfix: + external: true