From 010468636ddfa9a4360c770505dd80ce6a5bd95d Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Mon, 30 Jan 2017 10:58:33 +0100
Subject: [PATCH 1/2] Push to compose 2.1

---
 docker-compose.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index a2d0efee..921ecaf0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
 
 services:
     pdns-mailcow:
@@ -60,7 +60,7 @@ services:
         - dkim-vol-1:/data/dkim
         - rspamd-vol-1:/var/lib/rspamd
       restart: always
-      dns: 
+      dns:
         - 172.22.1.254
       dns_search: mailcow-network
       networks:
@@ -142,11 +142,11 @@ services:
         - DBUSER=${DBUSER}
         - DBPASS=${DBPASS}
       ports:
-        - "${IMAP_PORT}:143"
-        - "${IMAPS_PORT}:993"
-        - "${POP_PORT}:110"
-        - "${POPS_PORT}:995"
-        - "${SIEVE_PORT}:4190"
+        - "${IMAP_PORT:-143}:143"
+        - "${IMAPS_PORT:-993}:993"
+        - "${POP_PORT-110}:110"
+        - "${POPS_PORT:-995}:995"
+        - "${SIEVE_PORT:-4190}:4190"
       dns:
         - 172.22.1.254
       dns_search: mailcow-network
@@ -169,12 +169,12 @@ services:
         - DBUSER=${DBUSER}
         - DBPASS=${DBPASS}
       ports:
-        - "${SMTP_PORT}:25"
-        - "${SMTPS_PORT}:465"
-        - "${SUBMISSION_PORT}:587"
+        - "${SMTP_PORT:-25}:25"
+        - "${SMTPS_PORT:-465}:465"
+        - "${SUBMISSION_PORT:-587}:587"
       restart: always
       hostname: ${MAILCOW_HOSTNAME}
-      dns: 
+      dns:
         - 172.22.1.254
       dns_search: mailcow-network
       networks:
@@ -204,7 +204,7 @@ services:
       image: nginx:mainline
       command: /bin/bash -c "envsubst < /etc/nginx/conf.d/listen.template > /etc/nginx/conf.d/listen.active && nginx -g 'daemon off;'"
       environment:
-        - HTTPS_PORT=${HTTPS_PORT}
+        - HTTPS_PORT=${HTTPS_PORT:-443}
       volumes:
         - ./data/web:/web:ro
         - ./data/conf/rspamd/dynmaps:/dynmaps:ro
@@ -214,7 +214,7 @@ services:
         - 172.22.1.254
       dns_search: mailcow-network
       ports:
-        - "${HTTPS_PORT}:${HTTPS_PORT}"
+        - "${HTTPS_PORT:-443}:${HTTPS_PORT:-443}"
       restart: always
       networks:
         mailcow-network:

From 1cda28ce69044cf54ba45cfd5c3b527b8e993629 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Mon, 30 Jan 2017 11:24:38 +0100
Subject: [PATCH 2/2] Do not overwrite admin on db update

---
 data/web/inc/init.sql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/web/inc/init.sql b/data/web/inc/init.sql
index b2cff817..6dc7fa4b 100644
--- a/data/web/inc/init.sql
+++ b/data/web/inc/init.sql
@@ -276,6 +276,6 @@ CREATE TABLE IF NOT EXISTS sogo_user_profile (
 	PRIMARY KEY (c_uid)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
-REPLACE INTO admin (username, password, superadmin, created, modified, active) VALUES ('admin', '{SSHA256}K8eVJ6YsZbQCfuJvSUbaQRLr0HPLz5rC9IAp0PAFl0tmNDBkMDc0NDAyOTAxN2Rk', 1, NOW(), NOW(), 1);
-DELETE FROM domain_admins WHERE domain='all';
-INSERT INTO domain_admins (username, domain, created, active) VALUES ('admin', 'ALL', NOW(), 1);
+INSERT INTO `admin` (username, password, superadmin, created, modified, active) SELECT 'admin', '{SSHA256}K8eVJ6YsZbQCfuJvSUbaQRLr0HPLz5rC9IAp0PAFl0tmNDBkMDc0NDAyOTAxN2Rk', 1, NOW(), NOW(), 1 FROM `admin` WHERE NOT EXISTS (SELECT * FROM `admin`);
+DELETE FROM `domain_admins`;
+INSERT INTO `domain_admins` (username, domain, created, active) SELECT `username`, 'ALL', NOW(), 1 FROM `admin` WHERE superadmin='1' AND `username` NOT IN (SELECT `username` FROM `domain_admins`);