roles/docker/defaults/main.yml

@@ -89,7 +89,7 @@ services:
     domain: "matrix.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/matrix"
     pre_deploy_tasks: true
-    version: v1.98.0
+    version: v1.90.0
     postgres_version: 15-alpine
     allowed_sender_domain: true
 
@@ -97,7 +97,7 @@ services:
     domain: "element.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/element"
     pre_deploy_tasks: true
-    version: v1.11.51
+    version: v1.11.43
 
   privatebin:
     domain: "paste.{{ base_domain }}"
@@ -156,11 +156,6 @@ services:
       - "www.cryptoaarhus.dk"
     volume_folder: "{{ volume_website_folder }}/cryptoaarhus"
 
-  phanpy_website:
-    domain: "phanpy.data.coop"
-    volume_folder: "{{ volume_website_folder }}/phanpy"
-    version: latest
-
   drone:
     domain: "drone.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/drone"
@@ -172,9 +167,7 @@ services:
     pre_deploy_tasks: true
     dns: 192.168.203.254
     subnet: 192.168.203.0/24
-    version: "2.0"
-    postgres_version: 14-alpine
-    redis_version: alpine
+    version: "1.9"
 
   mastodon:
     domain: "social.{{ base_domain }}"

roles/docker/tasks/main.yml

@@ -21,6 +21,12 @@
       - docker-ce
       - docker-compose-plugin
 
+- name: Create docker-compose symlink
+  ansible.builtin.file:
+    name: /usr/local/bin/docker-compose
+    src: /usr/libexec/docker/cli-plugins/docker-compose
+    state: link
+
 - name: Configure cron job to prune unused Docker data weekly
   cron:
     name: Prune unused Docker data

roles/docker/tasks/pre_deploy/mailu.yml

@@ -19,7 +19,7 @@
     - overrides/dovecot
     - overrides/postfix
     - overrides/rspamd
-    - overrides/snappymail
+    - overrides/rainloop
   loop_control:
     loop_var: volume
 

roles/docker/templates/compose-files/mailu.yml.j2

@@ -1,10 +1,10 @@
 # vim: ft=yaml.docker-compose
-version: "3.8"
+version: '3.6'
 
 services:
   postgres:
-    image: postgres:{{ services.mailu.postgres_version }}
-    restart: unless-stopped
+    image: postgres:14-alpine
+    restart: always
     environment:
       POSTGRES_DB: mailu
       POSTGRES_USER: mailu
@@ -15,8 +15,8 @@ services:
       - "{{ services.mailu.dns }}"
 
   redis:
-    image: redis:{{ services.mailu.redis_version }}
-    restart: unless-stopped
+    image: redis:alpine
+    restart: always
     volumes:
       - "./redis:/data"
     depends_on:
@@ -26,7 +26,7 @@ services:
 
   front:
     image: ghcr.io/mailu/nginx:{{ services.mailu.version }}
-    restart: unless-stopped
+    restart: always
     env_file: mailu.env
     environment:
       VIRTUAL_HOST: "{{ services.mailu.domain }}"
@@ -38,25 +38,17 @@ services:
     expose:
       - "80"
     ports:
-      - "25:25"
-      - "465:465"
-      - "587:587"
-      - "110:110"
-      - "995:995"
-      - "143:143"
       - "993:993"
+      - "25:25"
+      - "587:587"
+      - "465:465"
     networks:
       - default
-      - webmail
       - external_services
-    depends_on:
-      - resolver
-    dns:
-      - "{{ services.mailu.dns }}"
 
   resolver:
     image: ghcr.io/mailu/unbound:{{ services.mailu.version }}
-    restart: unless-stopped
+    restart: always
     env_file: mailu.env
     networks:
       default:
@@ -64,15 +56,11 @@ services:
 
   admin:
     image: ghcr.io/mailu/admin:{{ services.mailu.version }}
-    restart: unless-stopped
-    env_file: mailu.env
+    restart: always
+    env_file: "{{ services.mailu.volume_folder }}/mailu.env"
     volumes:
       - "./data:/data"
       - "./dkim:/dkim"
-    networks:
-      default:
-        aliases:
-          - admin.mailu
     depends_on:
       - redis
       - resolver
@@ -81,7 +69,7 @@ services:
 
   imap:
     image: ghcr.io/mailu/dovecot:{{ services.mailu.version }}
-    restart: unless-stopped
+    restart: always
     env_file: mailu.env
     volumes:
       - "./mail:/mail"
@@ -94,7 +82,7 @@ services:
 
   smtp:
     image: ghcr.io/mailu/postfix:{{ services.mailu.version }}
-    restart: unless-stopped
+    restart: always
     env_file: mailu.env
     volumes:
       - "./mailqueue:/queue"
@@ -105,33 +93,32 @@ services:
     dns:
       - "{{ services.mailu.dns }}"
 
-
   antispam:
     image: ghcr.io/mailu/rspamd:{{ services.mailu.version }}
     hostname: antispam
-    restart: unless-stopped
+    restart: always
     env_file: mailu.env
     volumes:
       - "./filter:/var/lib/rspamd"
-      - "./overrides/rspamd:/overrides:ro"
+      - "./overrides/rspamd:/etc/rspamd/override.d:ro"
     depends_on:
       - front
-      - redis
       - resolver
     dns:
       - "{{ services.mailu.dns }}"
 
   webmail:
-    image: ghcr.io/mailu/webmail:{{ services.mailu.version }}
-    restart: unless-stopped
+    image: ghcr.io/mailu/rainloop:{{ services.mailu.version }}
+    restart: always
     env_file: mailu.env
     volumes:
       - "./webmail:/data"
-      - "./overrides/snappymail:/overrides:ro"
-    networks:
-      - webmail
+      - "./overrides/rainloop:/overrides:ro"
     depends_on:
-      - front
+      - imap
+      - resolver
+    dns:
+      - "{{ services.mailu.dns }}"
 
 networks:
   default:
@@ -140,7 +127,5 @@ networks:
       driver: default
       config:
         - subnet: "{{ services.mailu.subnet }}"
-  webmail:
-    driver: bridge
   external_services:
     external: true

roles/docker/templates/compose-files/nginx_proxy.yml.j2

@@ -17,7 +17,7 @@ services:
       - "./certs:/etc/nginx/certs:ro"
       - "/var/run/docker.sock:/tmp/docker.sock:ro"
     labels:
-      - com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy
+      - com.github.nginx-proxy.nginx
 
 {% if letsencrypt_enabled %}
   acme:

roles/docker/templates/compose-files/phanpy_website.yml.j2

@@ -1,22 +0,0 @@
-# vim: ft=yaml.docker-compose
-version: "3.8"
-
-services:
-  web:
-    image: docker.data.coop/unipi:{{ services.phanpy_website.version }}
-    restart: unless-stopped
-    networks:
-      - external_services
-    environment:
-      VIRTUAL_HOST: "{{ services.phanpy_website.domain }}"
-      LETSENCRYPT_HOST: "{{ services.phanpy_website.domain }}"
-      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
-    command: --remote=https://git.data.coop/reynir/phanpy.git#production
-    cap_add:
-      - NET_ADMIN
-    devices:
-      - "/dev/net/tun"
-
-networks:
-  external_services:
-    external: true

roles/docker/templates/compose-files/postfix.yml.j2

@@ -6,8 +6,6 @@ services:
     image: boky/postfix:{{ services.postfix.version }}
     restart: always
     networks:
-      postfix:
-        aliases:
       - postfix
     volumes:
       - "./dkim:/etc/opendkim/keys"

roles/docker/templates/mailu/env.j2

@@ -43,10 +43,7 @@ DISABLE_STATISTICS=True
 ADMIN=true
 
 # Choose which webmail to run if any (values: roundcube, rainloop, none)
-WEBMAIL=snappymail
-
-# Expose the API interface (value: true, false)
-API=false
+WEBMAIL=rainloop
 
 # Dav server implementation (value: radicale, none)
 WEBDAV=none
@@ -54,9 +51,6 @@ WEBDAV=none
 # Antivirus solution (value: clamav, none)
 ANTIVIRUS=none
 
-# Scan Macros solution (value: true, false)
-SCAN_MACROS=false
-
 ###################################
 # Mail settings
 ###################################
@@ -76,9 +70,6 @@ RELAYNETS=
 # Will relay all outgoing mails if configured
 RELAYHOST=
 
-# Enable fetchmail
-FETCHMAIL_ENABLED=False
-
 # Fetchmail delay
 FETCHMAIL_DELAY=600
 
@@ -117,14 +108,11 @@ WEB_ADMIN=/admin
 # Path to the webmail if enabled
 WEB_WEBMAIL=/webmail
 
-# Path to the API interface if enabled
-WEB_API=/api
-
 # Website name
 SITENAME={{ base_domain }}
 
 # Linked Website URL
-WEBSITE=https://{{ base_domain }}
+WEBSITE=https://{{ services.mailu.domain }}
 
 
 
@@ -139,7 +127,7 @@ WEBSITE=https://{{ base_domain }}
 # LOG_DRIVER=json-file
 
 # Docker-compose project name, this will prepended to containers names.
-COMPOSE_PROJECT_NAME=mailu
+COMPOSE_PROJECT_NAME=mail_server
 
 # Number of rounds used by the password hashing scheme
 CREDENTIAL_ROUNDS=12
@@ -159,25 +147,12 @@ LOG_LEVEL=WARNING
 # Timezone for the Mailu containers. See this link for all possible values https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 TZ=Europe/Copenhagen
 
-# Default spam threshold used for new users
-DEFAULT_SPAM_THRESHOLD=80
-
-# API token required for authenticating to the RESTful API.
-# This is a mandatory setting for using the RESTful API.
-API_TOKEN=
-
-###################################
-# Container address settings
-###################################
-
-ADMIN_ADDRESS=admin.mailu
-
 ###################################
 # Database settings
 ###################################
-
 DB_FLAVOR=postgresql
 DB_USER=mailu
 DB_PW={{ postgres_passwords.mailu }}
 DB_HOST=postgres
 DB_NAME=mailu
+