From 86a95def0100a3c2fcca51474cb38a55cc77c210 Mon Sep 17 00:00:00 2001 From: Pastilhas Date: Tue, 20 Oct 2020 22:29:32 +0100 Subject: [PATCH] [DOCKER][MAIL] Changed directory path --- {dockermail => docker/mail}/LICENSE | 0 {dockermail => docker/mail}/README | 0 {dockermail => docker/mail}/db/Dockerfile | 0 .../docker-entrypoint-initdb.d/001_mailserver.sql | 0 .../docker-entrypoint-initdb.d/002_webmail.sql | 0 {dockermail => docker/mail}/docker-compose.yml | 0 {dockermail => docker/mail}/filter/Dockerfile | 0 .../rootfs/etc/rspamd/local.d/antivirus.conf.templ | 0 .../rootfs/etc/rspamd/local.d/classifier-bayes.conf | 0 .../rootfs/etc/rspamd/local.d/dkim_signing.conf | 0 .../filter/rootfs/etc/rspamd/local.d/logging.inc | 0 .../filter/rootfs/etc/rspamd/local.d/metrics.conf | 0 .../rootfs/etc/rspamd/local.d/milter_headers.conf | 0 .../filter/rootfs/etc/rspamd/local.d/options.inc | 0 .../mail}/filter/rootfs/etc/rspamd/local.d/rbl.conf | 0 .../etc/rspamd/local.d/worker-controller.inc.templ | 0 .../rootfs/etc/rspamd/local.d/worker-proxy.inc | 0 .../mail}/filter/rootfs/usr/local/bin/entrypoint.sh | 0 {dockermail => docker/mail}/mda/Dockerfile | 0 .../mda/rootfs/etc/dovecot/conf.d/10-auth.conf | 0 .../mda/rootfs/etc/dovecot/conf.d/10-logging.conf | 0 .../mda/rootfs/etc/dovecot/conf.d/10-mail.conf | 0 .../rootfs/etc/dovecot/conf.d/10-master.conf.templ | 0 .../mail}/mda/rootfs/etc/dovecot/conf.d/10-ssl.conf | 0 .../mda/rootfs/etc/dovecot/conf.d/15-lda.conf.templ | 0 .../mda/rootfs/etc/dovecot/conf.d/15-mailboxes.conf | 0 .../mda/rootfs/etc/dovecot/conf.d/20-imap.conf | 0 .../mda/rootfs/etc/dovecot/conf.d/20-lmtp.conf | 0 .../rootfs/etc/dovecot/conf.d/20-managesieve.conf | 0 .../etc/dovecot/conf.d/20-submission.conf.templ | 0 .../mda/rootfs/etc/dovecot/conf.d/90-quota.conf | 0 .../mda/rootfs/etc/dovecot/conf.d/90-sieve.conf | 0 .../mda/rootfs/etc/dovecot/conf.d/auth-sql.conf.ext | 0 .../rootfs/etc/dovecot/dovecot-sql.conf.ext.templ | 0 .../rootfs/etc/dovecot/sieve/global/learn-ham.sieve | 0 .../etc/dovecot/sieve/global/learn-spam.sieve | 0 .../etc/dovecot/sieve/global/spam-to-folder.sieve | 0 .../mail}/mda/rootfs/usr/lib/dovecot/sieve/rspamc | 0 .../mail}/mda/rootfs/usr/local/bin/dh.sh | 0 .../mail}/mda/rootfs/usr/local/bin/entrypoint.sh | 0 {dockermail => docker/mail}/mta/Dockerfile | 0 .../mail}/mta/rootfs/etc/postfix/mime_header_checks | 0 .../rootfs/etc/postfix/mysql-email2email.cf.templ | 0 .../etc/postfix/mysql-recipient-access.cf.templ | 0 .../etc/postfix/mysql-virtual-alias-maps.cf.templ | 0 .../postfix/mysql-virtual-mailbox-domains.cf.templ | 0 .../etc/postfix/mysql-virtual-mailbox-maps.cf.templ | 0 .../mail}/mta/rootfs/etc/supervisord.conf | 0 .../mail}/mta/rootfs/usr/local/bin/entrypoint.sh | 0 {dockermail => docker/mail}/ssl/Dockerfile | 0 {dockermail => docker/mail}/ssl/create_tls.sh | 0 {dockermail => docker/mail}/test/Dockerfile | 0 .../mail}/test/rootfs/usr/local/bin/run-tests.sh | 0 .../mail}/test/rootfs/usr/share/tests/001_tls.bats | 0 .../test/rootfs/usr/share/tests/002_database.bats | 0 .../mail}/test/rootfs/usr/share/tests/003_mta.bats | 0 .../mail}/test/rootfs/usr/share/tests/004_web.bats | 0 .../mail}/test/rootfs/usr/share/tests/005_mda.bats | 0 .../test/rootfs/usr/share/tests/006_docker.bats | 0 .../test/rootfs/usr/share/tests/007_relayhost.bats | 0 .../mail}/test/rootfs/usr/share/tests/008_dkim.bats | 0 {dockermail => docker/mail}/virus/Dockerfile | 0 .../mail}/virus/contrib/unofficial-sigs/Dockerfile | 0 .../mail}/virus/rootfs/etc/clamav/clamd.conf | 0 .../mail}/virus/rootfs/etc/clamav/freshclam.conf | 0 .../mail}/virus/rootfs/usr/local/bin/entrypoint.sh | 0 {dockermail => docker/mail}/web/Dockerfile | 0 {dockermail => docker/mail}/web/README.md | 0 .../rootfs/etc/nginx/sites-enabled/10-docker.conf | 0 .../mail}/web/rootfs/usr/local/bin/entrypoint.sh | 0 .../mail}/web/rootfs/usr/local/bin/fixtures.sh | 0 .../mail}/web/rootfs/usr/local/bin/setup.sh | 0 .../var/www/html/webmail/config/config.inc.php | 0 .../html/webmail/plugins/managesieve/config.inc.php | 0 .../html/webmail/plugins/password/config.inc.php | 0 dockermail/.env | 13 ------------- 76 files changed, 13 deletions(-) rename {dockermail => docker/mail}/LICENSE (100%) rename {dockermail => docker/mail}/README (100%) rename {dockermail => docker/mail}/db/Dockerfile (100%) rename {dockermail => docker/mail}/db/rootfs/docker-entrypoint-initdb.d/001_mailserver.sql (100%) rename {dockermail => docker/mail}/db/rootfs/docker-entrypoint-initdb.d/002_webmail.sql (100%) rename {dockermail => docker/mail}/docker-compose.yml (100%) rename {dockermail => docker/mail}/filter/Dockerfile (100%) rename {dockermail => docker/mail}/filter/rootfs/etc/rspamd/local.d/antivirus.conf.templ (100%) rename {dockermail => docker/mail}/filter/rootfs/etc/rspamd/local.d/classifier-bayes.conf (100%) rename {dockermail => docker/mail}/filter/rootfs/etc/rspamd/local.d/dkim_signing.conf (100%) rename {dockermail => docker/mail}/filter/rootfs/etc/rspamd/local.d/logging.inc (100%) rename {dockermail => docker/mail}/filter/rootfs/etc/rspamd/local.d/metrics.conf (100%) rename {dockermail => docker/mail}/filter/rootfs/etc/rspamd/local.d/milter_headers.conf (100%) rename {dockermail => docker/mail}/filter/rootfs/etc/rspamd/local.d/options.inc (100%) rename {dockermail => docker/mail}/filter/rootfs/etc/rspamd/local.d/rbl.conf (100%) rename {dockermail => docker/mail}/filter/rootfs/etc/rspamd/local.d/worker-controller.inc.templ (100%) rename {dockermail => docker/mail}/filter/rootfs/etc/rspamd/local.d/worker-proxy.inc (100%) rename {dockermail => docker/mail}/filter/rootfs/usr/local/bin/entrypoint.sh (100%) rename {dockermail => docker/mail}/mda/Dockerfile (100%) rename {dockermail => docker/mail}/mda/rootfs/etc/dovecot/conf.d/10-auth.conf (100%) rename {dockermail => docker/mail}/mda/rootfs/etc/dovecot/conf.d/10-logging.conf (100%) rename {dockermail => docker/mail}/mda/rootfs/etc/dovecot/conf.d/10-mail.conf (100%) rename {dockermail => docker/mail}/mda/rootfs/etc/dovecot/conf.d/10-master.conf.templ (100%) rename {dockermail => docker/mail}/mda/rootfs/etc/dovecot/conf.d/10-ssl.conf (100%) rename {dockermail => docker/mail}/mda/rootfs/etc/dovecot/conf.d/15-lda.conf.templ (100%) rename {dockermail => docker/mail}/mda/rootfs/etc/dovecot/conf.d/15-mailboxes.conf (100%) rename {dockermail => docker/mail}/mda/rootfs/etc/dovecot/conf.d/20-imap.conf (100%) rename {dockermail => docker/mail}/mda/rootfs/etc/dovecot/conf.d/20-lmtp.conf (100%) rename {dockermail => docker/mail}/mda/rootfs/etc/dovecot/conf.d/20-managesieve.conf (100%) rename {dockermail => docker/mail}/mda/rootfs/etc/dovecot/conf.d/20-submission.conf.templ (100%) rename {dockermail => docker/mail}/mda/rootfs/etc/dovecot/conf.d/90-quota.conf (100%) rename {dockermail => docker/mail}/mda/rootfs/etc/dovecot/conf.d/90-sieve.conf (100%) rename {dockermail => docker/mail}/mda/rootfs/etc/dovecot/conf.d/auth-sql.conf.ext (100%) rename {dockermail => docker/mail}/mda/rootfs/etc/dovecot/dovecot-sql.conf.ext.templ (100%) rename {dockermail => docker/mail}/mda/rootfs/etc/dovecot/sieve/global/learn-ham.sieve (100%) rename {dockermail => docker/mail}/mda/rootfs/etc/dovecot/sieve/global/learn-spam.sieve (100%) rename {dockermail => docker/mail}/mda/rootfs/etc/dovecot/sieve/global/spam-to-folder.sieve (100%) rename {dockermail => docker/mail}/mda/rootfs/usr/lib/dovecot/sieve/rspamc (100%) rename {dockermail => docker/mail}/mda/rootfs/usr/local/bin/dh.sh (100%) rename {dockermail => docker/mail}/mda/rootfs/usr/local/bin/entrypoint.sh (100%) rename {dockermail => docker/mail}/mta/Dockerfile (100%) rename {dockermail => docker/mail}/mta/rootfs/etc/postfix/mime_header_checks (100%) rename {dockermail => docker/mail}/mta/rootfs/etc/postfix/mysql-email2email.cf.templ (100%) rename {dockermail => docker/mail}/mta/rootfs/etc/postfix/mysql-recipient-access.cf.templ (100%) rename {dockermail => docker/mail}/mta/rootfs/etc/postfix/mysql-virtual-alias-maps.cf.templ (100%) rename {dockermail => docker/mail}/mta/rootfs/etc/postfix/mysql-virtual-mailbox-domains.cf.templ (100%) rename {dockermail => docker/mail}/mta/rootfs/etc/postfix/mysql-virtual-mailbox-maps.cf.templ (100%) rename {dockermail => docker/mail}/mta/rootfs/etc/supervisord.conf (100%) rename {dockermail => docker/mail}/mta/rootfs/usr/local/bin/entrypoint.sh (100%) rename {dockermail => docker/mail}/ssl/Dockerfile (100%) rename {dockermail => docker/mail}/ssl/create_tls.sh (100%) rename {dockermail => docker/mail}/test/Dockerfile (100%) rename {dockermail => docker/mail}/test/rootfs/usr/local/bin/run-tests.sh (100%) rename {dockermail => docker/mail}/test/rootfs/usr/share/tests/001_tls.bats (100%) rename {dockermail => docker/mail}/test/rootfs/usr/share/tests/002_database.bats (100%) rename {dockermail => docker/mail}/test/rootfs/usr/share/tests/003_mta.bats (100%) rename {dockermail => docker/mail}/test/rootfs/usr/share/tests/004_web.bats (100%) rename {dockermail => docker/mail}/test/rootfs/usr/share/tests/005_mda.bats (100%) rename {dockermail => docker/mail}/test/rootfs/usr/share/tests/006_docker.bats (100%) rename {dockermail => docker/mail}/test/rootfs/usr/share/tests/007_relayhost.bats (100%) rename {dockermail => docker/mail}/test/rootfs/usr/share/tests/008_dkim.bats (100%) rename {dockermail => docker/mail}/virus/Dockerfile (100%) rename {dockermail => docker/mail}/virus/contrib/unofficial-sigs/Dockerfile (100%) rename {dockermail => docker/mail}/virus/rootfs/etc/clamav/clamd.conf (100%) rename {dockermail => docker/mail}/virus/rootfs/etc/clamav/freshclam.conf (100%) rename {dockermail => docker/mail}/virus/rootfs/usr/local/bin/entrypoint.sh (100%) rename {dockermail => docker/mail}/web/Dockerfile (100%) rename {dockermail => docker/mail}/web/README.md (100%) rename {dockermail => docker/mail}/web/rootfs/etc/nginx/sites-enabled/10-docker.conf (100%) rename {dockermail => docker/mail}/web/rootfs/usr/local/bin/entrypoint.sh (100%) rename {dockermail => docker/mail}/web/rootfs/usr/local/bin/fixtures.sh (100%) rename {dockermail => docker/mail}/web/rootfs/usr/local/bin/setup.sh (100%) rename {dockermail => docker/mail}/web/rootfs/var/www/html/webmail/config/config.inc.php (100%) rename {dockermail => docker/mail}/web/rootfs/var/www/html/webmail/plugins/managesieve/config.inc.php (100%) rename {dockermail => docker/mail}/web/rootfs/var/www/html/webmail/plugins/password/config.inc.php (100%) delete mode 100644 dockermail/.env diff --git a/dockermail/LICENSE b/docker/mail/LICENSE similarity index 100% rename from dockermail/LICENSE rename to docker/mail/LICENSE diff --git a/dockermail/README b/docker/mail/README similarity index 100% rename from dockermail/README rename to docker/mail/README diff --git a/dockermail/db/Dockerfile b/docker/mail/db/Dockerfile similarity index 100% rename from dockermail/db/Dockerfile rename to docker/mail/db/Dockerfile diff --git a/dockermail/db/rootfs/docker-entrypoint-initdb.d/001_mailserver.sql b/docker/mail/db/rootfs/docker-entrypoint-initdb.d/001_mailserver.sql similarity index 100% rename from dockermail/db/rootfs/docker-entrypoint-initdb.d/001_mailserver.sql rename to docker/mail/db/rootfs/docker-entrypoint-initdb.d/001_mailserver.sql diff --git a/dockermail/db/rootfs/docker-entrypoint-initdb.d/002_webmail.sql b/docker/mail/db/rootfs/docker-entrypoint-initdb.d/002_webmail.sql similarity index 100% rename from dockermail/db/rootfs/docker-entrypoint-initdb.d/002_webmail.sql rename to docker/mail/db/rootfs/docker-entrypoint-initdb.d/002_webmail.sql diff --git a/dockermail/docker-compose.yml b/docker/mail/docker-compose.yml similarity index 100% rename from dockermail/docker-compose.yml rename to docker/mail/docker-compose.yml diff --git a/dockermail/filter/Dockerfile b/docker/mail/filter/Dockerfile similarity index 100% rename from dockermail/filter/Dockerfile rename to docker/mail/filter/Dockerfile diff --git a/dockermail/filter/rootfs/etc/rspamd/local.d/antivirus.conf.templ b/docker/mail/filter/rootfs/etc/rspamd/local.d/antivirus.conf.templ similarity index 100% rename from dockermail/filter/rootfs/etc/rspamd/local.d/antivirus.conf.templ rename to docker/mail/filter/rootfs/etc/rspamd/local.d/antivirus.conf.templ diff --git a/dockermail/filter/rootfs/etc/rspamd/local.d/classifier-bayes.conf b/docker/mail/filter/rootfs/etc/rspamd/local.d/classifier-bayes.conf similarity index 100% rename from dockermail/filter/rootfs/etc/rspamd/local.d/classifier-bayes.conf rename to docker/mail/filter/rootfs/etc/rspamd/local.d/classifier-bayes.conf diff --git a/dockermail/filter/rootfs/etc/rspamd/local.d/dkim_signing.conf b/docker/mail/filter/rootfs/etc/rspamd/local.d/dkim_signing.conf similarity index 100% rename from dockermail/filter/rootfs/etc/rspamd/local.d/dkim_signing.conf rename to docker/mail/filter/rootfs/etc/rspamd/local.d/dkim_signing.conf diff --git a/dockermail/filter/rootfs/etc/rspamd/local.d/logging.inc b/docker/mail/filter/rootfs/etc/rspamd/local.d/logging.inc similarity index 100% rename from dockermail/filter/rootfs/etc/rspamd/local.d/logging.inc rename to docker/mail/filter/rootfs/etc/rspamd/local.d/logging.inc diff --git a/dockermail/filter/rootfs/etc/rspamd/local.d/metrics.conf b/docker/mail/filter/rootfs/etc/rspamd/local.d/metrics.conf similarity index 100% rename from dockermail/filter/rootfs/etc/rspamd/local.d/metrics.conf rename to docker/mail/filter/rootfs/etc/rspamd/local.d/metrics.conf diff --git a/dockermail/filter/rootfs/etc/rspamd/local.d/milter_headers.conf b/docker/mail/filter/rootfs/etc/rspamd/local.d/milter_headers.conf similarity index 100% rename from dockermail/filter/rootfs/etc/rspamd/local.d/milter_headers.conf rename to docker/mail/filter/rootfs/etc/rspamd/local.d/milter_headers.conf diff --git a/dockermail/filter/rootfs/etc/rspamd/local.d/options.inc b/docker/mail/filter/rootfs/etc/rspamd/local.d/options.inc similarity index 100% rename from dockermail/filter/rootfs/etc/rspamd/local.d/options.inc rename to docker/mail/filter/rootfs/etc/rspamd/local.d/options.inc diff --git a/dockermail/filter/rootfs/etc/rspamd/local.d/rbl.conf b/docker/mail/filter/rootfs/etc/rspamd/local.d/rbl.conf similarity index 100% rename from dockermail/filter/rootfs/etc/rspamd/local.d/rbl.conf rename to docker/mail/filter/rootfs/etc/rspamd/local.d/rbl.conf diff --git a/dockermail/filter/rootfs/etc/rspamd/local.d/worker-controller.inc.templ b/docker/mail/filter/rootfs/etc/rspamd/local.d/worker-controller.inc.templ similarity index 100% rename from dockermail/filter/rootfs/etc/rspamd/local.d/worker-controller.inc.templ rename to docker/mail/filter/rootfs/etc/rspamd/local.d/worker-controller.inc.templ diff --git a/dockermail/filter/rootfs/etc/rspamd/local.d/worker-proxy.inc b/docker/mail/filter/rootfs/etc/rspamd/local.d/worker-proxy.inc similarity index 100% rename from dockermail/filter/rootfs/etc/rspamd/local.d/worker-proxy.inc rename to docker/mail/filter/rootfs/etc/rspamd/local.d/worker-proxy.inc diff --git a/dockermail/filter/rootfs/usr/local/bin/entrypoint.sh b/docker/mail/filter/rootfs/usr/local/bin/entrypoint.sh similarity index 100% rename from dockermail/filter/rootfs/usr/local/bin/entrypoint.sh rename to docker/mail/filter/rootfs/usr/local/bin/entrypoint.sh diff --git a/dockermail/mda/Dockerfile b/docker/mail/mda/Dockerfile similarity index 100% rename from dockermail/mda/Dockerfile rename to docker/mail/mda/Dockerfile diff --git a/dockermail/mda/rootfs/etc/dovecot/conf.d/10-auth.conf b/docker/mail/mda/rootfs/etc/dovecot/conf.d/10-auth.conf similarity index 100% rename from dockermail/mda/rootfs/etc/dovecot/conf.d/10-auth.conf rename to docker/mail/mda/rootfs/etc/dovecot/conf.d/10-auth.conf diff --git a/dockermail/mda/rootfs/etc/dovecot/conf.d/10-logging.conf b/docker/mail/mda/rootfs/etc/dovecot/conf.d/10-logging.conf similarity index 100% rename from dockermail/mda/rootfs/etc/dovecot/conf.d/10-logging.conf rename to docker/mail/mda/rootfs/etc/dovecot/conf.d/10-logging.conf diff --git a/dockermail/mda/rootfs/etc/dovecot/conf.d/10-mail.conf b/docker/mail/mda/rootfs/etc/dovecot/conf.d/10-mail.conf similarity index 100% rename from dockermail/mda/rootfs/etc/dovecot/conf.d/10-mail.conf rename to docker/mail/mda/rootfs/etc/dovecot/conf.d/10-mail.conf diff --git a/dockermail/mda/rootfs/etc/dovecot/conf.d/10-master.conf.templ b/docker/mail/mda/rootfs/etc/dovecot/conf.d/10-master.conf.templ similarity index 100% rename from dockermail/mda/rootfs/etc/dovecot/conf.d/10-master.conf.templ rename to docker/mail/mda/rootfs/etc/dovecot/conf.d/10-master.conf.templ diff --git a/dockermail/mda/rootfs/etc/dovecot/conf.d/10-ssl.conf b/docker/mail/mda/rootfs/etc/dovecot/conf.d/10-ssl.conf similarity index 100% rename from dockermail/mda/rootfs/etc/dovecot/conf.d/10-ssl.conf rename to docker/mail/mda/rootfs/etc/dovecot/conf.d/10-ssl.conf diff --git a/dockermail/mda/rootfs/etc/dovecot/conf.d/15-lda.conf.templ b/docker/mail/mda/rootfs/etc/dovecot/conf.d/15-lda.conf.templ similarity index 100% rename from dockermail/mda/rootfs/etc/dovecot/conf.d/15-lda.conf.templ rename to docker/mail/mda/rootfs/etc/dovecot/conf.d/15-lda.conf.templ diff --git a/dockermail/mda/rootfs/etc/dovecot/conf.d/15-mailboxes.conf b/docker/mail/mda/rootfs/etc/dovecot/conf.d/15-mailboxes.conf similarity index 100% rename from dockermail/mda/rootfs/etc/dovecot/conf.d/15-mailboxes.conf rename to docker/mail/mda/rootfs/etc/dovecot/conf.d/15-mailboxes.conf diff --git a/dockermail/mda/rootfs/etc/dovecot/conf.d/20-imap.conf b/docker/mail/mda/rootfs/etc/dovecot/conf.d/20-imap.conf similarity index 100% rename from dockermail/mda/rootfs/etc/dovecot/conf.d/20-imap.conf rename to docker/mail/mda/rootfs/etc/dovecot/conf.d/20-imap.conf diff --git a/dockermail/mda/rootfs/etc/dovecot/conf.d/20-lmtp.conf b/docker/mail/mda/rootfs/etc/dovecot/conf.d/20-lmtp.conf similarity index 100% rename from dockermail/mda/rootfs/etc/dovecot/conf.d/20-lmtp.conf rename to docker/mail/mda/rootfs/etc/dovecot/conf.d/20-lmtp.conf diff --git a/dockermail/mda/rootfs/etc/dovecot/conf.d/20-managesieve.conf b/docker/mail/mda/rootfs/etc/dovecot/conf.d/20-managesieve.conf similarity index 100% rename from dockermail/mda/rootfs/etc/dovecot/conf.d/20-managesieve.conf rename to docker/mail/mda/rootfs/etc/dovecot/conf.d/20-managesieve.conf diff --git a/dockermail/mda/rootfs/etc/dovecot/conf.d/20-submission.conf.templ b/docker/mail/mda/rootfs/etc/dovecot/conf.d/20-submission.conf.templ similarity index 100% rename from dockermail/mda/rootfs/etc/dovecot/conf.d/20-submission.conf.templ rename to docker/mail/mda/rootfs/etc/dovecot/conf.d/20-submission.conf.templ diff --git a/dockermail/mda/rootfs/etc/dovecot/conf.d/90-quota.conf b/docker/mail/mda/rootfs/etc/dovecot/conf.d/90-quota.conf similarity index 100% rename from dockermail/mda/rootfs/etc/dovecot/conf.d/90-quota.conf rename to docker/mail/mda/rootfs/etc/dovecot/conf.d/90-quota.conf diff --git a/dockermail/mda/rootfs/etc/dovecot/conf.d/90-sieve.conf b/docker/mail/mda/rootfs/etc/dovecot/conf.d/90-sieve.conf similarity index 100% rename from dockermail/mda/rootfs/etc/dovecot/conf.d/90-sieve.conf rename to docker/mail/mda/rootfs/etc/dovecot/conf.d/90-sieve.conf diff --git a/dockermail/mda/rootfs/etc/dovecot/conf.d/auth-sql.conf.ext b/docker/mail/mda/rootfs/etc/dovecot/conf.d/auth-sql.conf.ext similarity index 100% rename from dockermail/mda/rootfs/etc/dovecot/conf.d/auth-sql.conf.ext rename to docker/mail/mda/rootfs/etc/dovecot/conf.d/auth-sql.conf.ext diff --git a/dockermail/mda/rootfs/etc/dovecot/dovecot-sql.conf.ext.templ b/docker/mail/mda/rootfs/etc/dovecot/dovecot-sql.conf.ext.templ similarity index 100% rename from dockermail/mda/rootfs/etc/dovecot/dovecot-sql.conf.ext.templ rename to docker/mail/mda/rootfs/etc/dovecot/dovecot-sql.conf.ext.templ diff --git a/dockermail/mda/rootfs/etc/dovecot/sieve/global/learn-ham.sieve b/docker/mail/mda/rootfs/etc/dovecot/sieve/global/learn-ham.sieve similarity index 100% rename from dockermail/mda/rootfs/etc/dovecot/sieve/global/learn-ham.sieve rename to docker/mail/mda/rootfs/etc/dovecot/sieve/global/learn-ham.sieve diff --git a/dockermail/mda/rootfs/etc/dovecot/sieve/global/learn-spam.sieve b/docker/mail/mda/rootfs/etc/dovecot/sieve/global/learn-spam.sieve similarity index 100% rename from dockermail/mda/rootfs/etc/dovecot/sieve/global/learn-spam.sieve rename to docker/mail/mda/rootfs/etc/dovecot/sieve/global/learn-spam.sieve diff --git a/dockermail/mda/rootfs/etc/dovecot/sieve/global/spam-to-folder.sieve b/docker/mail/mda/rootfs/etc/dovecot/sieve/global/spam-to-folder.sieve similarity index 100% rename from dockermail/mda/rootfs/etc/dovecot/sieve/global/spam-to-folder.sieve rename to docker/mail/mda/rootfs/etc/dovecot/sieve/global/spam-to-folder.sieve diff --git a/dockermail/mda/rootfs/usr/lib/dovecot/sieve/rspamc b/docker/mail/mda/rootfs/usr/lib/dovecot/sieve/rspamc similarity index 100% rename from dockermail/mda/rootfs/usr/lib/dovecot/sieve/rspamc rename to docker/mail/mda/rootfs/usr/lib/dovecot/sieve/rspamc diff --git a/dockermail/mda/rootfs/usr/local/bin/dh.sh b/docker/mail/mda/rootfs/usr/local/bin/dh.sh similarity index 100% rename from dockermail/mda/rootfs/usr/local/bin/dh.sh rename to docker/mail/mda/rootfs/usr/local/bin/dh.sh diff --git a/dockermail/mda/rootfs/usr/local/bin/entrypoint.sh b/docker/mail/mda/rootfs/usr/local/bin/entrypoint.sh similarity index 100% rename from dockermail/mda/rootfs/usr/local/bin/entrypoint.sh rename to docker/mail/mda/rootfs/usr/local/bin/entrypoint.sh diff --git a/dockermail/mta/Dockerfile b/docker/mail/mta/Dockerfile similarity index 100% rename from dockermail/mta/Dockerfile rename to docker/mail/mta/Dockerfile diff --git a/dockermail/mta/rootfs/etc/postfix/mime_header_checks b/docker/mail/mta/rootfs/etc/postfix/mime_header_checks similarity index 100% rename from dockermail/mta/rootfs/etc/postfix/mime_header_checks rename to docker/mail/mta/rootfs/etc/postfix/mime_header_checks diff --git a/dockermail/mta/rootfs/etc/postfix/mysql-email2email.cf.templ b/docker/mail/mta/rootfs/etc/postfix/mysql-email2email.cf.templ similarity index 100% rename from dockermail/mta/rootfs/etc/postfix/mysql-email2email.cf.templ rename to docker/mail/mta/rootfs/etc/postfix/mysql-email2email.cf.templ diff --git a/dockermail/mta/rootfs/etc/postfix/mysql-recipient-access.cf.templ b/docker/mail/mta/rootfs/etc/postfix/mysql-recipient-access.cf.templ similarity index 100% rename from dockermail/mta/rootfs/etc/postfix/mysql-recipient-access.cf.templ rename to docker/mail/mta/rootfs/etc/postfix/mysql-recipient-access.cf.templ diff --git a/dockermail/mta/rootfs/etc/postfix/mysql-virtual-alias-maps.cf.templ b/docker/mail/mta/rootfs/etc/postfix/mysql-virtual-alias-maps.cf.templ similarity index 100% rename from dockermail/mta/rootfs/etc/postfix/mysql-virtual-alias-maps.cf.templ rename to docker/mail/mta/rootfs/etc/postfix/mysql-virtual-alias-maps.cf.templ diff --git a/dockermail/mta/rootfs/etc/postfix/mysql-virtual-mailbox-domains.cf.templ b/docker/mail/mta/rootfs/etc/postfix/mysql-virtual-mailbox-domains.cf.templ similarity index 100% rename from dockermail/mta/rootfs/etc/postfix/mysql-virtual-mailbox-domains.cf.templ rename to docker/mail/mta/rootfs/etc/postfix/mysql-virtual-mailbox-domains.cf.templ diff --git a/dockermail/mta/rootfs/etc/postfix/mysql-virtual-mailbox-maps.cf.templ b/docker/mail/mta/rootfs/etc/postfix/mysql-virtual-mailbox-maps.cf.templ similarity index 100% rename from dockermail/mta/rootfs/etc/postfix/mysql-virtual-mailbox-maps.cf.templ rename to docker/mail/mta/rootfs/etc/postfix/mysql-virtual-mailbox-maps.cf.templ diff --git a/dockermail/mta/rootfs/etc/supervisord.conf b/docker/mail/mta/rootfs/etc/supervisord.conf similarity index 100% rename from dockermail/mta/rootfs/etc/supervisord.conf rename to docker/mail/mta/rootfs/etc/supervisord.conf diff --git a/dockermail/mta/rootfs/usr/local/bin/entrypoint.sh b/docker/mail/mta/rootfs/usr/local/bin/entrypoint.sh similarity index 100% rename from dockermail/mta/rootfs/usr/local/bin/entrypoint.sh rename to docker/mail/mta/rootfs/usr/local/bin/entrypoint.sh diff --git a/dockermail/ssl/Dockerfile b/docker/mail/ssl/Dockerfile similarity index 100% rename from dockermail/ssl/Dockerfile rename to docker/mail/ssl/Dockerfile diff --git a/dockermail/ssl/create_tls.sh b/docker/mail/ssl/create_tls.sh similarity index 100% rename from dockermail/ssl/create_tls.sh rename to docker/mail/ssl/create_tls.sh diff --git a/dockermail/test/Dockerfile b/docker/mail/test/Dockerfile similarity index 100% rename from dockermail/test/Dockerfile rename to docker/mail/test/Dockerfile diff --git a/dockermail/test/rootfs/usr/local/bin/run-tests.sh b/docker/mail/test/rootfs/usr/local/bin/run-tests.sh similarity index 100% rename from dockermail/test/rootfs/usr/local/bin/run-tests.sh rename to docker/mail/test/rootfs/usr/local/bin/run-tests.sh diff --git a/dockermail/test/rootfs/usr/share/tests/001_tls.bats b/docker/mail/test/rootfs/usr/share/tests/001_tls.bats similarity index 100% rename from dockermail/test/rootfs/usr/share/tests/001_tls.bats rename to docker/mail/test/rootfs/usr/share/tests/001_tls.bats diff --git a/dockermail/test/rootfs/usr/share/tests/002_database.bats b/docker/mail/test/rootfs/usr/share/tests/002_database.bats similarity index 100% rename from dockermail/test/rootfs/usr/share/tests/002_database.bats rename to docker/mail/test/rootfs/usr/share/tests/002_database.bats diff --git a/dockermail/test/rootfs/usr/share/tests/003_mta.bats b/docker/mail/test/rootfs/usr/share/tests/003_mta.bats similarity index 100% rename from dockermail/test/rootfs/usr/share/tests/003_mta.bats rename to docker/mail/test/rootfs/usr/share/tests/003_mta.bats diff --git a/dockermail/test/rootfs/usr/share/tests/004_web.bats b/docker/mail/test/rootfs/usr/share/tests/004_web.bats similarity index 100% rename from dockermail/test/rootfs/usr/share/tests/004_web.bats rename to docker/mail/test/rootfs/usr/share/tests/004_web.bats diff --git a/dockermail/test/rootfs/usr/share/tests/005_mda.bats b/docker/mail/test/rootfs/usr/share/tests/005_mda.bats similarity index 100% rename from dockermail/test/rootfs/usr/share/tests/005_mda.bats rename to docker/mail/test/rootfs/usr/share/tests/005_mda.bats diff --git a/dockermail/test/rootfs/usr/share/tests/006_docker.bats b/docker/mail/test/rootfs/usr/share/tests/006_docker.bats similarity index 100% rename from dockermail/test/rootfs/usr/share/tests/006_docker.bats rename to docker/mail/test/rootfs/usr/share/tests/006_docker.bats diff --git a/dockermail/test/rootfs/usr/share/tests/007_relayhost.bats b/docker/mail/test/rootfs/usr/share/tests/007_relayhost.bats similarity index 100% rename from dockermail/test/rootfs/usr/share/tests/007_relayhost.bats rename to docker/mail/test/rootfs/usr/share/tests/007_relayhost.bats diff --git a/dockermail/test/rootfs/usr/share/tests/008_dkim.bats b/docker/mail/test/rootfs/usr/share/tests/008_dkim.bats similarity index 100% rename from dockermail/test/rootfs/usr/share/tests/008_dkim.bats rename to docker/mail/test/rootfs/usr/share/tests/008_dkim.bats diff --git a/dockermail/virus/Dockerfile b/docker/mail/virus/Dockerfile similarity index 100% rename from dockermail/virus/Dockerfile rename to docker/mail/virus/Dockerfile diff --git a/dockermail/virus/contrib/unofficial-sigs/Dockerfile b/docker/mail/virus/contrib/unofficial-sigs/Dockerfile similarity index 100% rename from dockermail/virus/contrib/unofficial-sigs/Dockerfile rename to docker/mail/virus/contrib/unofficial-sigs/Dockerfile diff --git a/dockermail/virus/rootfs/etc/clamav/clamd.conf b/docker/mail/virus/rootfs/etc/clamav/clamd.conf similarity index 100% rename from dockermail/virus/rootfs/etc/clamav/clamd.conf rename to docker/mail/virus/rootfs/etc/clamav/clamd.conf diff --git a/dockermail/virus/rootfs/etc/clamav/freshclam.conf b/docker/mail/virus/rootfs/etc/clamav/freshclam.conf similarity index 100% rename from dockermail/virus/rootfs/etc/clamav/freshclam.conf rename to docker/mail/virus/rootfs/etc/clamav/freshclam.conf diff --git a/dockermail/virus/rootfs/usr/local/bin/entrypoint.sh b/docker/mail/virus/rootfs/usr/local/bin/entrypoint.sh similarity index 100% rename from dockermail/virus/rootfs/usr/local/bin/entrypoint.sh rename to docker/mail/virus/rootfs/usr/local/bin/entrypoint.sh diff --git a/dockermail/web/Dockerfile b/docker/mail/web/Dockerfile similarity index 100% rename from dockermail/web/Dockerfile rename to docker/mail/web/Dockerfile diff --git a/dockermail/web/README.md b/docker/mail/web/README.md similarity index 100% rename from dockermail/web/README.md rename to docker/mail/web/README.md diff --git a/dockermail/web/rootfs/etc/nginx/sites-enabled/10-docker.conf b/docker/mail/web/rootfs/etc/nginx/sites-enabled/10-docker.conf similarity index 100% rename from dockermail/web/rootfs/etc/nginx/sites-enabled/10-docker.conf rename to docker/mail/web/rootfs/etc/nginx/sites-enabled/10-docker.conf diff --git a/dockermail/web/rootfs/usr/local/bin/entrypoint.sh b/docker/mail/web/rootfs/usr/local/bin/entrypoint.sh similarity index 100% rename from dockermail/web/rootfs/usr/local/bin/entrypoint.sh rename to docker/mail/web/rootfs/usr/local/bin/entrypoint.sh diff --git a/dockermail/web/rootfs/usr/local/bin/fixtures.sh b/docker/mail/web/rootfs/usr/local/bin/fixtures.sh similarity index 100% rename from dockermail/web/rootfs/usr/local/bin/fixtures.sh rename to docker/mail/web/rootfs/usr/local/bin/fixtures.sh diff --git a/dockermail/web/rootfs/usr/local/bin/setup.sh b/docker/mail/web/rootfs/usr/local/bin/setup.sh similarity index 100% rename from dockermail/web/rootfs/usr/local/bin/setup.sh rename to docker/mail/web/rootfs/usr/local/bin/setup.sh diff --git a/dockermail/web/rootfs/var/www/html/webmail/config/config.inc.php b/docker/mail/web/rootfs/var/www/html/webmail/config/config.inc.php similarity index 100% rename from dockermail/web/rootfs/var/www/html/webmail/config/config.inc.php rename to docker/mail/web/rootfs/var/www/html/webmail/config/config.inc.php diff --git a/dockermail/web/rootfs/var/www/html/webmail/plugins/managesieve/config.inc.php b/docker/mail/web/rootfs/var/www/html/webmail/plugins/managesieve/config.inc.php similarity index 100% rename from dockermail/web/rootfs/var/www/html/webmail/plugins/managesieve/config.inc.php rename to docker/mail/web/rootfs/var/www/html/webmail/plugins/managesieve/config.inc.php diff --git a/dockermail/web/rootfs/var/www/html/webmail/plugins/password/config.inc.php b/docker/mail/web/rootfs/var/www/html/webmail/plugins/password/config.inc.php similarity index 100% rename from dockermail/web/rootfs/var/www/html/webmail/plugins/password/config.inc.php rename to docker/mail/web/rootfs/var/www/html/webmail/plugins/password/config.inc.php diff --git a/dockermail/.env b/dockermail/.env deleted file mode 100644 index 68c926dbdc..0000000000 --- a/dockermail/.env +++ /dev/null @@ -1,13 +0,0 @@ -MYSQL_DATABASE=mailserver -MYSQL_USER=mailserver -MYSQL_PASSWORD=changeme -MYSQL_ROOT_PASSWORD=changeme -MAILNAME=mail.example.com -POSTMASTER=postmaster@example.com -RELAYHOST=false -FILTER_MIME=false -FILTER_VIRUS=true -ENABLE_IMAP=true -ENABLE_POP3=true -CONTROLLER_PASSWORD=changeme -WAITSTART_TIMEOUT=2m