Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f612f645 authored by Felix's avatar Felix
Browse files

Merge branch 'remove-hostname-containername' into 'master' 

Cleanup docker-compose.yml

See merge request e/priv/infra/ecloud-selfhosting!47
parents 3ae055ff a87283d6

templates/docker-compose/docker-compose-base.yml

+23 −23
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ version: '2.1' 
services:

  eelomailserver:

    image: hardware/mailserver:1.1-stable

    container_name: mailserver

    container_name: eelomailserver

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

    hostname: mail

    restart: always
@@ -77,9 +77,9 @@ services: 
    volumes:

      - /mnt/repo-base/volumes/redis/db:/data



  accounts:

  welcome:

    image: registry.gitlab.e.foundation:5000/e/infra/docker-welcome:0.2.2

        container_name: accounts

    container_name: welcome

    environment:

      - DOMAINS=${VHOSTS_ACCOUNTS}

      - DOMAIN=${DOMAIN}

templates/docker-compose/docker-compose-networks.yml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
      - create-account

      - automx

      - postfixadmin

      - accounts

      - welcome

      - eelomailserver

      #- onlyoffice-community-server

templates/docker-compose/docker-compose-onlyoffice.yml

+1 −2
Original line number Diff line number Diff line 


  onlyoffice-documentserver:

    image: onlyoffice/documentserver:5.2.6.3

    container_name: onlyoffice-document-server

    container_name: onlyoffice-documentserver

    stdin_open: true

    restart: always

    networks:
@@ -12,7 +12,6 @@ 
  onlyoffice-mail-server:

    image: onlyoffice/mailserver:1.6.35

    container_name: onlyoffice-mail-server

    hostname: cleus.eu

    stdin_open: true

    restart: always

    networks:

templates/nginx/sites-enabled/rspamd.conf

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ server { 
  #auth_basic_user_file /passwds/<NAME>.htpasswd;



  location / {

    proxy_pass http://mailserver:11334;

    proxy_pass http://eelomailserver:11334;

    include /etc/nginx/params/proxy_params;

  }

}