From cf84b82c578806157184e04bcb5e27c43ec77cc6 Mon Sep 17 00:00:00 2001
From: Pierre Jaury <pierre@jaury.eu>
Date: Sat, 20 Aug 2016 16:32:10 +0200
Subject: [PATCH] Move the configuration file to .env to support global
 variables

---
 freeposte.env => .env |  6 +++++
 docker-compose.yml    | 57 ++++++++++++++++++++-----------------------
 2 files changed, 33 insertions(+), 30 deletions(-)
 rename freeposte.env => .env (85%)

diff --git a/freeposte.env b/.env
similarity index 85%
rename from freeposte.env
rename to .env
index 838b6047..47d92f25 100644
--- a/freeposte.env
+++ b/.env
@@ -4,6 +4,12 @@
 # these few settings must however be configured before starting the mail
 # server and require a restart upon change.
 
+# Project name
+COMPOSE_PROJECT_NAME=freeposte
+
+# Set this to the path where Freeposte data and configuration is stored
+ROOT=/freeposte
+
 # Set this to enable debugging globally
 DEBUG=False
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 3f82959a..c47b9511 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,98 +6,95 @@ services:
     # build: nginx
     image: freeposte/reverse-proxy
     restart: always
-    env_file: freeposte.env
+    env_file: .env
     ports:
       - "80:80"
       - "443:443"
-    links:
-      - webmail
-      - admin
     volumes:
-      - /freeposte/certs:/certs
+      - "$ROOT/certs:/certs"
 
   redis:
     image: redis
     restart: always
     volumes:
-      - /freeposte/redis:/data
+      - "$ROOT/redis:/data"
 
   imap:
     # build: dovecot
     image: freeposte/dovecot
     restart: always
-    env_file: freeposte.env
+    env_file: .env
     ports:
       - "143:143"
       - "993:993"
     volumes:
-      - /freeposte/freeposte:/data
-      - /freeposte/mail:/mail
-      - /freeposte/certs:/certs
-      - /freeposte/overrides:/overrides
+      - "$ROOT/freeposte:/data"
+      - "$ROOT/mail:/mail"
+      - "$ROOT/certs:/certs"
+      - "$ROOT/overrides:/overrides"
 
   smtp:
     # build: postfix
     image: freeposte/postfix
     restart: always
-    env_file: freeposte.env
+    env_file: .env
     ports:
       - "25:25"
       - "465:465"
       - "587:587"
     volumes:
-      - /freeposte/freeposte:/data
-      - /freeposte/certs:/certs
-      - /freeposte/overrides:/overrides
+      - "$ROOT/freeposte:/data"
+      - "$ROOT/certs:/certs"
+      - "$ROOT/overrides:/overrides"
 
   milter:
     # build: rmilter
     image: freeposte/rmilter
     restart: always
-    env_file: freeposte.env
+    env_file: .env
     volumes:
-      - /freeposte/filter:/data
-      - /freeposte/dkim:/dkim
-      - /freeposte/overrides:/overrides
+      - "$ROOT/filter:/data"
+      - "$ROOT/dkim:/dkim"
+      - "$ROOT/overrides:/overrides"
 
   antispam:
     # build: rspamd
     image: freeposte/rspamd
     restart: always
-    env_file: freeposte.env
+    env_file: .env
     volumes:
-      - /freeposte/filter:/var/lib/rspamd
+      - "$ROOT/filter:/var/lib/rspamd"
 
   antivirus:
     # build: clamav
     image: freeposte/clamav
     restart: always
-    env_file: freeposte.env
+    env_file: .env
     volumes:
-      - /freeposte/filter:/data
+      - "$ROOT/filter:/data"
 
   admin:
     # build: admin
     image: freeposte/admin
     restart: always
-    env_file: freeposte.env
+    env_file: .env
     volumes:
-      - /freeposte/freeposte:/data
-      - /freeposte/dkim:/dkim
+      - "$ROOT/freeposte:/data"
+      - "$ROOT/dkim:/dkim"
       - /var/run/docker.sock:/var/run/docker.sock:ro
 
   webmail:
     # build: roundcube
     image: freeposte/roundcube
     restart: always
-    env_file: freeposte.env
+    env_file: .env
     volumes:
-      - /freeposte/webmail:/data
+      - "$ROOT/webmail:/data"
 
   fetchmail:
     # build: fetchmail
     image: freeposte/fetchmail
     restart: always
-    env_file: freeposte.env
+    env_file: .env
     volumes:
-      - /freeposte/freeposte:/data
+      - "$ROOT/freeposte:/data"