From 1d4f6b3e07a97ac609d78c1f9eb094b6cf428b97 Mon Sep 17 00:00:00 2001
From: Hattshire <hattshire@gmail.com>
Date: Mon, 20 Oct 2025 22:24:09 -0300
Subject: [PATCH] Use variables

---
 docker-compose.yml | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 39f0af7..b5ac8fb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,8 +15,7 @@ services:
   mail:
     image: docker.io/mailserver/docker-mailserver:latest
     hostname: mail
-    domainname: uwu.email
-    container_name: mail
+    domainname: ${DOMAIN_NAME:?Domain Name Required}
     ports:
     - "25:25"
     - "587:587"
@@ -31,8 +30,8 @@ services:
     - ./priv_config/opendkim/:/tmp/docker-mailserver/opendkim/
     environment:
     - SSL_TYPE=letsencrypt
-    - LETSENCRYPT_HOST=mail.uwu.email
-    - VIRTUAL_HOST=mail.uwu.email
+    - LETSENCRYPT_HOST=${SERVER_DOMAIN_NAME:-mail.${DOMAIN_NAME}}
+    - VIRTUAL_HOST=${SERVER_DOMAIN_NAME:-mail.${DOMAIN_NAME}}
 
     - ONE_DIR=1
     - DMS_DEBUG=1
@@ -49,19 +48,17 @@ services:
 
   webmail:
     image: docker.io/roundcube/roundcubemail:latest
-    hostname: webmail.uwu.email
-    container_name: webmail
+    hostname: ${SERVER_DOMAIN_NAME:-webmail.${DOMAIN_NAME}}
     restart: always
-    expose:
-     - 80
     environment:
       - ROUNDCUBEMAIL_DB_TYPE=sqlite
       - ROUNDCUBEMAIL_SKIN=elastic
-      - ROUNDCUBEMAIL_DEFAULT_HOST=tls://mail.uwu.email
-      - ROUNDCUBEMAIL_SMTP_SERVER=tls://mail.uwu.email
-      - VIRTUAL_HOST=webmail.uwu.email
-      - LETSENCRYPT_HOST=webmail.uwu.email
+      - ROUNDCUBEMAIL_DEFAULT_HOST=tls://${SERVER_DOMAIN_NAME:-mail.${DOMAIN_NAME}}
+      - ROUNDCUBEMAIL_SMTP_SERVER=tls://${SERVER_DOMAIN_NAME:-mail.${DOMAIN_NAME}}
       - ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE=9M
+
+      - VIRTUAL_HOST=${WEBMAIL_DOMAIN_NAME:-webmail.${DOMAIN_NAME}}
+      - LETSENCRYPT_HOST=${WEBMAIL_DOMAIN_NAME:-webmail.${DOMAIN_NAME}}
     volumes:
       # TODO Use Postgres
       - roundcube_sqlite:/var/roundcube/db