From 719afcf0ddbae6e8fb9674eb723e364c54e4098c Mon Sep 17 00:00:00 2001
From: Pierre Jaury <pierre@jaury.eu>
Date: Wed, 20 Apr 2016 21:17:43 +0200
Subject: [PATCH] Switch to the new networking API

---
 docker-compose.yml        | 11 -----------
 dovecot/conf/dovecot.conf |  1 +
 freeposte.env             |  2 +-
 nginx/nginx.conf          |  8 ++++++--
 postfix/conf/main.cf      |  4 ++--
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index a05ed8bb..b557d0cf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,9 +9,6 @@ services:
     ports:
       - "80:80"
       - "443:443"
-    links:
-      - admin:admin
-      - webmail:webmail
     volumes:
       - /data/certs:/certs
 
@@ -35,9 +32,6 @@ services:
       - "25:25"
       - "465:465"
       - "587:587"
-    links:
-      - filter:lmtp
-      - imap:sasl
     volumes:
       - /data/freeposte:/data
       - /data/logs:/logs
@@ -47,8 +41,6 @@ services:
     build: amavis
     image: freeposte/amavis
     env_file: freeposte.env
-    links:
-      - imap:lmtp
     volumes:
       - /data/filter:/data
 
@@ -63,8 +55,5 @@ services:
     build: roundcube
     image: freeposte/roundcube
     env_file: freeposte.env
-    links:
-      - imap:imap
-      - smtp:smtp
     volumes:
       - /data/webmail:/data
diff --git a/dovecot/conf/dovecot.conf b/dovecot/conf/dovecot.conf
index 97b238c0..ab3b4768 100644
--- a/dovecot/conf/dovecot.conf
+++ b/dovecot/conf/dovecot.conf
@@ -6,6 +6,7 @@ protocols = imap lmtp sieve
 postmaster_address = %{env:POSTMASTER}@%{env:DOMAIN}
 hostname = %{env:HOSTNAME}
 mail_plugins = $mail_plugins quota
+submission_host = smtp
 
 service dict {
   unix_listener dict {
diff --git a/freeposte.env b/freeposte.env
index 011e9e43..90a7f977 100644
--- a/freeposte.env
+++ b/freeposte.env
@@ -21,4 +21,4 @@ POSTMASTER=admin
 
 # Networks granted relay permissions, make sure that you include your Docker
 # internal network (default to 172.17.0.0/16)
-RELAYNETS=172.17.0.0/16
+RELAYNETS=172.16.0.0/12
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index eb700a4e..8c8beddc 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -33,11 +33,15 @@ http {
     	}
 
       location / {
-        proxy_pass http://webmail;
+        resolver 127.0.0.11;
+        set $webmail_backend "http://webmail";
+        proxy_pass $webmail_backend;
       }
 
       location /admin {
-        proxy_pass http://admin;
+        resolver 127.0.0.11;
+        set $admin_backend "http://admin";
+        proxy_pass $admin_backend;
       }
     }
 }
diff --git a/postfix/conf/main.cf b/postfix/conf/main.cf
index 26926dc9..98864bdd 100644
--- a/postfix/conf/main.cf
+++ b/postfix/conf/main.cf
@@ -30,7 +30,7 @@ smtp_tls_security_level = may
 ###############
 smtpd_sasl_local_domain = $myhostname
 smtpd_sasl_type = dovecot
-smtpd_sasl_path = inet:sasl:2102
+smtpd_sasl_path = inet:imap:2102
 smtpd_sasl_auth_enable = yes
 smtpd_sasl_security_options = noanonymous
 
@@ -39,5 +39,5 @@ smtpd_sasl_security_options = noanonymous
 ###############
 virtual_mailbox_domains = ${sql}sqlite-virtual_mailbox_domains.cf
 virtual_alias_maps = ${sql}sqlite-virtual_alias_maps.cf
-virtual_transport = lmtp:inet:lmtp:2525
+virtual_transport = lmtp:inet:filter:2525
 lmtp_host_lookup = native