Commit 38a567f5 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Reintenta recuperar el correo, con nuevos valores 

Recupera algunos de los ajustes previos y añade alguna variable de
entorno nueva.
parent 7623af49

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ deploy-mail-server-dev: 
      MYSQL_PASSWORD=${DB_PASSWORD}

    - export DEPLOY_DIR_NAME=mail/redis SERVICE=mail-redis IMAGE_TAG=4.0-alpine

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

    - export DEPLOY_DIR_NAME=mail/mailserver SERVICE=mail-mailserver IMAGE_TAG=1.1-stable

    - export DEPLOY_DIR_NAME=mail/mailserver SERVICE=mail-mailserver IMAGE_TAG=1.1-latest

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} RSPAMD_PASSWORD=${RSPAMD_PASSWORD}

      DBPASS=${DB_PASSWORD}

mail/mailserver/.env

+2 −1
Original line number Diff line number Diff line 
DOMAIN_NAME=redmic.es

HOST_NAME=mail

ADD_DOMAINS=redmic.net

CERTIFICATES_PATH=/etc/letsencrypt/live/redmic.net-0001

REDIS_HOST=mail-redis

DBHOST=mail-mariadb

RSPAMD_PORT=11334

mail/mailserver/docker-compose.tmpl.yml

+3 −3
Original line number Diff line number Diff line
@@ -4,18 +4,18 @@ services: 
  mail-mailserver:

    image: hardware/mailserver:${IMAGE_TAG:-latest}

    domainname: ${DOMAIN_NAME} # Mail server A/MX/FQDN & reverse PTR = mail.domain.tld.

    hostname: ${HOST_NAME}

    hostname: mail-mailserver

    networks:

      - mail-net

    volumes:

      - mail-mailserver-vol:/var/mail

      - /etc/letsencrypt:/etc/letsencrypt

      - ${CERTIFICATES_PATH}:/etc/letsencrypt/live/mail-mailserver.${DOMAIN_NAME}

    environment:

      - REDIS_HOST

      - DBHOST

      - DBPASS # MariaDB database password (required)

      - RSPAMD_PASSWORD # Rspamd WebUI password (required)

    # - ADD_DOMAINS=aa.tld, www.bb.tld... # Add additional domains separated by commas (needed for dkim keys etc.)

      - ADD_DOMAINS # Add additional domains separated by commas (needed for dkim keys etc.)

    # - ENABLE_POP3=true # Enable POP3 protocol

    # - ENABLE_FETCHMAIL=true # Enable fetchmail forwarding

    # - DISABLE_CLAMAV=true # Disable virus scanning

mail/postfixadmin/.env

+1 −0
Original line number Diff line number Diff line 
DOMAIN_NAME=redmic.net

HOST_NAME=mail

POSTFIXADMIN_PORT=5000

SMTPHOST=mail-mailserver

DBHOST=mail-mariadb

DBPASS=password

mail/postfixadmin/docker-compose.tmpl.yml

+2 −1
Original line number Diff line number Diff line
@@ -4,12 +4,13 @@ services: 
  mail-postfixadmin:

    image: hardware/postfixadmin:${IMAGE_TAG:-latest}

    domainname: ${DOMAIN_NAME}

    hostname: ${HOST_NAME}

    hostname: mail-postfixadmin

    networks:

      - mail-net

    environment:

      - DBHOST

      - DBPASS

      - SMTPHOST



networks:

  mail-net: