From 4e4b071fb0e991e2b9e3a306545c753c4a241903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= Date: Sun, 13 Oct 2019 21:57:21 +0300 Subject: [PATCH] Move services into core and optional --- {services => core}/rspamd/Dockerfile | 0 {services => core}/rspamd/conf/antivirus.conf | 0 {services => core}/rspamd/conf/arc.conf | 0 {services => core}/rspamd/conf/dkim_signing.conf | 0 {services => core}/rspamd/conf/fuzzy_check.conf | 0 {services => core}/rspamd/conf/history_redis.conf | 0 {services => core}/rspamd/conf/logging.inc | 0 {services => core}/rspamd/conf/metrics.conf | 0 {services => core}/rspamd/conf/milter_headers.conf | 0 {services => core}/rspamd/conf/redis.conf | 0 {services => core}/rspamd/conf/worker-controller.inc | 0 {services => core}/rspamd/conf/worker-fuzzy.inc | 0 {services => core}/rspamd/conf/worker-normal.inc | 0 {services => core}/rspamd/conf/worker-proxy.inc | 0 {services => core}/rspamd/start.py | 0 {services => optional}/fetchmail/Dockerfile | 0 {services => optional}/fetchmail/fetchmail.py | 0 {services => optional}/unbound/Dockerfile | 0 {services => optional}/unbound/start.py | 0 {services => optional}/unbound/unbound.conf | 0 tests/build.yml | 6 +++--- towncrier/newsfragments/1214.misc | 1 + 22 files changed, 4 insertions(+), 3 deletions(-) rename {services => core}/rspamd/Dockerfile (100%) rename {services => core}/rspamd/conf/antivirus.conf (100%) rename {services => core}/rspamd/conf/arc.conf (100%) rename {services => core}/rspamd/conf/dkim_signing.conf (100%) rename {services => core}/rspamd/conf/fuzzy_check.conf (100%) rename {services => core}/rspamd/conf/history_redis.conf (100%) rename {services => core}/rspamd/conf/logging.inc (100%) rename {services => core}/rspamd/conf/metrics.conf (100%) rename {services => core}/rspamd/conf/milter_headers.conf (100%) rename {services => core}/rspamd/conf/redis.conf (100%) rename {services => core}/rspamd/conf/worker-controller.inc (100%) rename {services => core}/rspamd/conf/worker-fuzzy.inc (100%) rename {services => core}/rspamd/conf/worker-normal.inc (100%) rename {services => core}/rspamd/conf/worker-proxy.inc (100%) rename {services => core}/rspamd/start.py (100%) rename {services => optional}/fetchmail/Dockerfile (100%) rename {services => optional}/fetchmail/fetchmail.py (100%) rename {services => optional}/unbound/Dockerfile (100%) rename {services => optional}/unbound/start.py (100%) rename {services => optional}/unbound/unbound.conf (100%) create mode 100644 towncrier/newsfragments/1214.misc diff --git a/services/rspamd/Dockerfile b/core/rspamd/Dockerfile similarity index 100% rename from services/rspamd/Dockerfile rename to core/rspamd/Dockerfile diff --git a/services/rspamd/conf/antivirus.conf b/core/rspamd/conf/antivirus.conf similarity index 100% rename from services/rspamd/conf/antivirus.conf rename to core/rspamd/conf/antivirus.conf diff --git a/services/rspamd/conf/arc.conf b/core/rspamd/conf/arc.conf similarity index 100% rename from services/rspamd/conf/arc.conf rename to core/rspamd/conf/arc.conf diff --git a/services/rspamd/conf/dkim_signing.conf b/core/rspamd/conf/dkim_signing.conf similarity index 100% rename from services/rspamd/conf/dkim_signing.conf rename to core/rspamd/conf/dkim_signing.conf diff --git a/services/rspamd/conf/fuzzy_check.conf b/core/rspamd/conf/fuzzy_check.conf similarity index 100% rename from services/rspamd/conf/fuzzy_check.conf rename to core/rspamd/conf/fuzzy_check.conf diff --git a/services/rspamd/conf/history_redis.conf b/core/rspamd/conf/history_redis.conf similarity index 100% rename from services/rspamd/conf/history_redis.conf rename to core/rspamd/conf/history_redis.conf diff --git a/services/rspamd/conf/logging.inc b/core/rspamd/conf/logging.inc similarity index 100% rename from services/rspamd/conf/logging.inc rename to core/rspamd/conf/logging.inc diff --git a/services/rspamd/conf/metrics.conf b/core/rspamd/conf/metrics.conf similarity index 100% rename from services/rspamd/conf/metrics.conf rename to core/rspamd/conf/metrics.conf diff --git a/services/rspamd/conf/milter_headers.conf b/core/rspamd/conf/milter_headers.conf similarity index 100% rename from services/rspamd/conf/milter_headers.conf rename to core/rspamd/conf/milter_headers.conf diff --git a/services/rspamd/conf/redis.conf b/core/rspamd/conf/redis.conf similarity index 100% rename from services/rspamd/conf/redis.conf rename to core/rspamd/conf/redis.conf diff --git a/services/rspamd/conf/worker-controller.inc b/core/rspamd/conf/worker-controller.inc similarity index 100% rename from services/rspamd/conf/worker-controller.inc rename to core/rspamd/conf/worker-controller.inc diff --git a/services/rspamd/conf/worker-fuzzy.inc b/core/rspamd/conf/worker-fuzzy.inc similarity index 100% rename from services/rspamd/conf/worker-fuzzy.inc rename to core/rspamd/conf/worker-fuzzy.inc diff --git a/services/rspamd/conf/worker-normal.inc b/core/rspamd/conf/worker-normal.inc similarity index 100% rename from services/rspamd/conf/worker-normal.inc rename to core/rspamd/conf/worker-normal.inc diff --git a/services/rspamd/conf/worker-proxy.inc b/core/rspamd/conf/worker-proxy.inc similarity index 100% rename from services/rspamd/conf/worker-proxy.inc rename to core/rspamd/conf/worker-proxy.inc diff --git a/services/rspamd/start.py b/core/rspamd/start.py similarity index 100% rename from services/rspamd/start.py rename to core/rspamd/start.py diff --git a/services/fetchmail/Dockerfile b/optional/fetchmail/Dockerfile similarity index 100% rename from services/fetchmail/Dockerfile rename to optional/fetchmail/Dockerfile diff --git a/services/fetchmail/fetchmail.py b/optional/fetchmail/fetchmail.py similarity index 100% rename from services/fetchmail/fetchmail.py rename to optional/fetchmail/fetchmail.py diff --git a/services/unbound/Dockerfile b/optional/unbound/Dockerfile similarity index 100% rename from services/unbound/Dockerfile rename to optional/unbound/Dockerfile diff --git a/services/unbound/start.py b/optional/unbound/start.py similarity index 100% rename from services/unbound/start.py rename to optional/unbound/start.py diff --git a/services/unbound/unbound.conf b/optional/unbound/unbound.conf similarity index 100% rename from services/unbound/unbound.conf rename to optional/unbound/unbound.conf diff --git a/tests/build.yml b/tests/build.yml index dd56dc41..eda5550c 100644 --- a/tests/build.yml +++ b/tests/build.yml @@ -8,7 +8,7 @@ services: resolver: image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}unbound:${MAILU_VERSION:-local} - build: ../services/unbound + build: ../optional/unbound imap: image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-local} @@ -20,7 +20,7 @@ services: antispam: image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-local} - build: ../services/rspamd + build: ../core/rspamd antivirus: image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}clamav:${MAILU_VERSION:-local} @@ -52,7 +52,7 @@ services: fetchmail: image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}fetchmail:${MAILU_VERSION:-local} - build: ../services/fetchmail + build: ../optional/fetchmail none: image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}none:${MAILU_VERSION:-local} diff --git a/towncrier/newsfragments/1214.misc b/towncrier/newsfragments/1214.misc new file mode 100644 index 00000000..adda05c9 --- /dev/null +++ b/towncrier/newsfragments/1214.misc @@ -0,0 +1 @@ +Move rspamd, fetchmail and unbound services into core and optional \ No newline at end of file