diff --git a/.env.sample b/.env.sample index 67a903af8570e497a22316303d00c84eddfa8152..2afd91ea9dbfad521c24c8c6c51d9842621a0be1 100644 --- a/.env.sample +++ b/.env.sample @@ -16,3 +16,6 @@ MY_NETWORKS=localhost 127.0.0.0/8 10.42.0.0/16 ROOT_ALIAS=admin@FQDN MY_DESTINATION=postfix.FQDN REMOTES=postfix +TRUSTED_HOSTS=sympa postfix +TRUSTED_PROXY=traefik +TZ=Europe/Paris diff --git a/docker-compose.yml b/docker-compose.yml index 97977657655ae75d94707e3a53a04fbf41b389c0..2252e71e7be2914c9036cfb22dc87f224fc783a3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,6 +26,8 @@ services: SYMPA_DB_NAME: SYMPA_DB_USER: SYMPA_DB_PASSWD: + TZ: + TRUSTED_PROXY: REMOTES: networks: - postfix @@ -50,6 +52,7 @@ services: ROOT_ALIAS: MY_DESTINATION: TRUSTED_HOSTS: + TZ: pgsql: diff --git a/docker/sympa/Dockerfile b/docker/sympa/Dockerfile index a628337c2a367f121321fe13c36b97908200a41c..d379f756451623961b615e3c5235c73cbac58e5b 100644 --- a/docker/sympa/Dockerfile +++ b/docker/sympa/Dockerfile @@ -4,12 +4,14 @@ ENV DEBIAN_FRONTEND noninteractive RUN apt-get -y update && apt-get -y upgrade && apt-get -y install \ apache2 \ + dnsutils \ inetutils-syslogd \ libapache2-mod-fcgid \ libdbd-pg-perl \ libfcgi-perl \ libnet-ldap-perl \ libio-socket-ssl-perl \ + locales \ nullmailer \ openssh-server \ spawn-fcgi \ @@ -29,10 +31,22 @@ COPY default.conf /etc/apache2/sites-available/000-default.conf RUN a2enmod rewrite substitute alias proxy proxy_fcgi +RUN a2enmod remoteip + +RUN echo 'RemoteIPHeader X-Forwarded-For' > /etc/apache2/conf-available/remoteip.conf + COPY supervisord.conf /etc/supervisor/conf.d COPY run.sh /opt/sympa_run.sh COPY entrypoint.sh /entrypoint +RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen + +ENV LANG en_US.UTF-8 + +ENV LANGUAGE en_US:en + +ENV LC_ALL en_US.UTF-8 + ENTRYPOINT /entrypoint diff --git a/docker/sympa/entrypoint.sh b/docker/sympa/entrypoint.sh index d086a55ed7e1cbc59e8e10404e0b82b0c92c588c..1522fbe016bdc1f0995b62fff2b91a208771fe73 100755 --- a/docker/sympa/entrypoint.sh +++ b/docker/sympa/entrypoint.sh @@ -83,6 +83,9 @@ if [ -n "$SYMPA_DOMAIN" ]; then echo "$SYMPA_DOMAIN" > /etc/mailname echo "$SYMPA_DOMAIN" > /etc/nullmailer/defaultdomain fi +proxy=$(dig +short $TRUSTED_PROXY) +echo "RemoteIPTrustedProxy $proxy" >> /etc/apache2/conf-available/remoteip.conf +a2enconf remoteip mkdir -p /var/log/supervisor/ # Launch all services