git subrepo clone https://github.com/mailcow/mailcow-dockerized.git mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "a832becb"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "a832becb"
git-subrepo: version: "0.4.3"
origin: "???"
commit: "???"
Change-Id: If5be2d621a211e164c9b6577adaa7884449f16b5
diff --git a/mailcow/src/mailcow-dockerized/helper-scripts/docker-compose.override.yml.d/BUILD_FLAGS/docker-compose.override.yml b/mailcow/src/mailcow-dockerized/helper-scripts/docker-compose.override.yml.d/BUILD_FLAGS/docker-compose.override.yml
new file mode 100644
index 0000000..a080fb3
--- /dev/null
+++ b/mailcow/src/mailcow-dockerized/helper-scripts/docker-compose.override.yml.d/BUILD_FLAGS/docker-compose.override.yml
@@ -0,0 +1,45 @@
+version: '2.1'
+services:
+ unbound-mailcow:
+ build: ./data/Dockerfiles/unbound
+
+ clamd-mailcow:
+ build: ./data/Dockerfiles/clamd
+
+ rspamd-mailcow:
+ build: ./data/Dockerfiles/rspamd
+
+ php-fpm-mailcow:
+ build: ./data/Dockerfiles/phpfpm
+
+ sogo-mailcow:
+ build:
+ context: ./data/Dockerfiles/sogo
+ dockerfile: Dockerfile
+ args:
+ - SOGO_DEBIAN_REPOSITORY=http://packages.inverse.ca/SOGo/nightly/5/debian/
+
+ dovecot-mailcow:
+ build: ./data/Dockerfiles/dovecot
+
+ postfix-mailcow:
+ build: ./data/Dockerfiles/postfix
+
+ acme-mailcow:
+ build: ./data/Dockerfiles/acme
+
+ netfilter-mailcow:
+ build: ./data/Dockerfiles/netfilter
+
+ watchdog-mailcow:
+ build: ./data/Dockerfiles/watchdog
+
+ dockerapi-mailcow:
+ build: ./data/Dockerfiles/dockerapi
+
+ solr-mailcow:
+ build: ./data/Dockerfiles/solr
+
+ olefy-mailcow:
+ build: ./data/Dockerfiles/olefy
+
diff --git a/mailcow/src/mailcow-dockerized/helper-scripts/docker-compose.override.yml.d/EXTERNAL_DNS/docker-compose.override.yml b/mailcow/src/mailcow-dockerized/helper-scripts/docker-compose.override.yml.d/EXTERNAL_DNS/docker-compose.override.yml
new file mode 100644
index 0000000..74763bf
--- /dev/null
+++ b/mailcow/src/mailcow-dockerized/helper-scripts/docker-compose.override.yml.d/EXTERNAL_DNS/docker-compose.override.yml
@@ -0,0 +1,44 @@
+version: '2.1'
+services:
+
+ clamd-mailcow:
+ dns:
+ - my.resolvers.ip.addr
+
+ rspamd-mailcow:
+ dns:
+ - my.resolvers.ip.addr
+
+ php-fpm-mailcow:
+ dns:
+ - my.resolvers.ip.addr
+
+ sogo-mailcow:
+ dns:
+ - my.resolvers.ip.addr
+
+ dovecot-mailcow:
+ dns:
+ - my.resolvers.ip.addr
+
+ postfix-mailcow:
+ dns:
+ - my.resolvers.ip.addr
+
+ nginx-mailcow:
+ dns:
+ - my.resolvers.ip.addr
+
+ acme-mailcow:
+ dns:
+ - my.resolvers.ip.addr
+
+ watchdog-mailcow:
+ environment:
+ - CHECK_UNBOUND=0
+ dns:
+ - my.resolvers.ip.addr
+
+ dockerapi-mailcow:
+ dns:
+ - my.resolvers.ip.addr
diff --git a/mailcow/src/mailcow-dockerized/helper-scripts/docker-compose.override.yml.d/EXTERNAL_MYSQL_SOCKET/docker-compose.override.yml b/mailcow/src/mailcow-dockerized/helper-scripts/docker-compose.override.yml.d/EXTERNAL_MYSQL_SOCKET/docker-compose.override.yml
new file mode 100644
index 0000000..7d4424e
--- /dev/null
+++ b/mailcow/src/mailcow-dockerized/helper-scripts/docker-compose.override.yml.d/EXTERNAL_MYSQL_SOCKET/docker-compose.override.yml
@@ -0,0 +1,31 @@
+version: '2.1'
+services:
+
+ php-fpm-mailcow:
+ volumes:
+ - /var/run/mysqld/mysqld.sock:/var/run/mysqld/mysqld.sock
+
+ sogo-mailcow:
+ volumes:
+ - /var/run/mysqld/mysqld.sock:/var/run/mysqld/mysqld.sock
+
+ dovecot-mailcow:
+ volumes:
+ - /var/run/mysqld/mysqld.sock:/var/run/mysqld/mysqld.sock
+
+ postfix-mailcow:
+ volumes:
+ - /var/run/mysqld/mysqld.sock:/var/run/mysqld/mysqld.sock
+
+ acme-mailcow:
+ volumes:
+ - /var/run/mysqld/mysqld.sock:/var/run/mysqld/mysqld.sock
+
+ watchdog-mailcow:
+ volumes:
+ - /var/run/mysqld/mysqld.sock:/var/run/mysqld/mysqld.sock
+
+ mysql-mailcow:
+ image: alpine:3.10
+ command: /bin/true
+ restart: "no"
diff --git a/mailcow/src/mailcow-dockerized/helper-scripts/docker-compose.override.yml.d/HAPROXY/docker-compose.override.yml b/mailcow/src/mailcow-dockerized/helper-scripts/docker-compose.override.yml.d/HAPROXY/docker-compose.override.yml
new file mode 100644
index 0000000..21d391b
--- /dev/null
+++ b/mailcow/src/mailcow-dockerized/helper-scripts/docker-compose.override.yml.d/HAPROXY/docker-compose.override.yml
@@ -0,0 +1,20 @@
+##
+## Set haproxy_trusted_networks in Dovecots extra.conf!
+#ä
+
+version: '2.1'
+services:
+
+ dovecot-mailcow:
+ ports:
+ - "${IMAP_PORT_HAPROXY:-127.0.0.1:10143}:10143"
+ - "${IMAPS_PORT_HAPROXY:-127.0.0.1:10993}:10993"
+ - "${POP_PORT_HAPROXY:-127.0.0.1:10110}:10110"
+ - "${POPS_PORT_HAPROXY:-127.0.0.1:10995}:10995"
+ - "${SIEVE_PORT_HAPROXY:-127.0.0.1:14190}:14190"
+
+ postfix-mailcow:
+ ports:
+ - "${SMTP_PORT_HAPROXY:-127.0.0.1:10025}:10025"
+ - "${SMTPS_PORT_HAPROXY:-127.0.0.1:10465}:10465"
+ - "${SUBMISSION_PORT_HAPROXY:-127.0.0.1:10587}:10587"