improve stack detection

stack/User/User.yml

@@ -49,8 +49,3 @@ volumes:
   user:
     external: true
     name: ${USER_DOCKER_VOLUME}
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK}

stack/User/ipfs.yml

@@ -94,11 +94,3 @@ volumes:
   home:
     external: true
     name: ${HOST_DOCKER_VOLUME}_home
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK}
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/cloud/nextcloud.yml

@@ -23,11 +23,3 @@ services:
 
 volumes:
   nextcloud:
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/drone/drone-runner-docker.yml

@@ -17,8 +17,3 @@ services:
     restart: always
     volumes:
     - /var/run/docker.sock:/var/run/docker.sock
-
-networks:
-  private:
-      external: true
-      name: ${DOCKER_NETWORK_PRIVATE}

stack/drone/drone.yml

@@ -33,11 +33,3 @@ services:
 
 volumes:
   drone:
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/drone/gc.yml

@@ -11,8 +11,3 @@ services:
     restart: always
     volumes:
     - /var/run/docker.sock:/var/run/docker.sock
-
-networks:
-  private:
-      external: true
-      name: ${DOCKER_NETWORK_PRIVATE}

stack/elastic/apm-server-oss.yml

@@ -19,11 +19,3 @@ services:
     ports:
     - 8200
     restart: always
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/elastic/apm-server.yml

@@ -16,11 +16,3 @@ services:
     ports:
     - 8200
     restart: always
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/elastic/curator.yml

@@ -19,8 +19,3 @@ services:
     networks:
     - private
     restart: always
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}

stack/elastic/elasticsearch.local.7.4.yml

@@ -4,4 +4,3 @@ services:
   elasticsearch:
     environment:
     - discovery.type=single-node
-

stack/elastic/elasticsearch.yml

@@ -38,11 +38,3 @@ services:
 
 volumes:
   elasticsearch:
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/elastic/kibana-oss.yml

@@ -12,11 +12,3 @@ services:
     ports:
     - 5601
     restart: always
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/elastic/kibana.yml

@@ -12,11 +12,3 @@ services:
     ports:
     - 5601
     restart: always
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/grafana/grafana.yml

@@ -30,11 +30,3 @@ services:
 
 volumes:
   grafana:
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/host/acme.mk

@@ -1,3 +1,5 @@
 ENV_VARS                                  += HOST_ACME_POST_HOOK HOST_ACME_PRE_HOOK
 HOST_ACME_DOMAIN_PATH_VALID               ?= $$(echo $${DOMAIN_PATH:-} |awk "'"/^[0-9a-z_\-\.+\/]+@[0-9a-z_\-\.]+\.[a-z0-9_\-\.\+\/]+$$/"'")
-HOST_ACME_POST_HOOK                       ?= [ "$(HOST_ACME_DOMAIN_PATH_VALID)" ] && cp fullchain.cer /host/certs/$${domain}-cert.pem 2>/dev/null && cp $${domain}.key /host/certs/$${domain}-key.pem
+HOST_ACME_DOMAIN_CERT_MODULUS             ?= $$(openssl x509 -in fullchain.cer -noout -modulus)
+HOST_ACME_DOMAIN_KEY_MODULUS              ?= $$(openssl rsa -in $${domain}.key -noout -modulus)
+HOST_ACME_POST_HOOK                       ?= [ "$(HOST_ACME_DOMAIN_PATH_VALID)" ] && cp -a fullchain.cer /host/certs/$${domain}-cert.pem 2>/dev/null && [ "$(HOST_ACME_DOMAIN_CERT_MODULUS)" = "$(HOST_ACME_DOMAIN_KEY_MODULUS)" ] && cp -a $${domain}.key /host/certs/$${domain}-key.pem

stack/host/acme.yml

@@ -31,8 +31,3 @@ volumes:
   host:
     external: true
     name: ${HOST_DOCKER_VOLUME}
-
-networks:
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/host/apache/php5.www.yml

@@ -9,4 +9,3 @@ services:
 
 volumes:
   www:
-

stack/host/apache/php5.yml

@@ -29,8 +29,3 @@ services:
 volumes:
   backup:
   web:
-
-networks:
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC:-localhost}

stack/host/backup/restic.yml

@@ -18,4 +18,3 @@ services:
 
 volumes:
   restic:
-

stack/host/exporter/cadvisor.yml

@@ -20,8 +20,3 @@ services:
     - /sys:/sys:ro
     - /var/lib/docker/:/var/lib/docker:ro
     - /var/run:/var/run:rw
-
-networks:
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/host/exporter/node.yml

@@ -23,8 +23,3 @@ services:
     - /:/rootfs:ro
     - /proc:/host/proc:ro
     - /sys:/host/sys:ro
-
-networks:
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/host/ftps.mk

@@ -0,0 +1 @@
+HOST_FTPS_UFW_DOCKER                      ?= 21/tcp 18700/tcp 18701/tcp 18702/tcp 18703/tcp 18704/tcp 18705/tcp 18706/tcp 18707/tcp 18708/tcp 18709/tcp 18710/tcp

stack/host/ftps.yml

@@ -0,0 +1,32 @@
+version: '3.6'
+
+services:
+  ftps:
+    container_name: ${HOST_COMPOSE_PROJECT_NAME}-ftps
+    environment:
+    - FTPS_EXTERNAL_IP=${DOCKER_HOST_INET4}
+    - FTPS_PASS=${HOST_FTPS_PASS}
+    - FTPS_USER=${HOST_FTPS_USER}
+    - FTPS_UID=${HOST_FTPS_UID}
+    image: bfren/ftps:latest
+    labels:
+    - SERVICE_21_CHECK_TCP=true
+    - SERVICE_21_NAME=${COMPOSE_SERVICE_NAME}-ftps-21
+    networks:
+    - private
+    - public
+    ports:
+    - 21:21
+    - 18700-18710:18700-18710
+    restart: always
+    volumes:
+    - backup:/files
+    - host:/host
+    - ssl:/ssl
+
+volumes:
+  backup:
+  host:
+    external: true
+    name: ${HOST_DOCKER_VOLUME}
+  ssl:

stack/host/ipfs.home.yml

@@ -7,4 +7,3 @@ services:
 
 volumes:
   home:
-

stack/host/ipfs.yml

@@ -86,4 +86,3 @@ services:
 
 volumes:
   ipfs:
-

stack/host/mail.mk

@@ -1,6 +1,7 @@
 # ENV_VARS                                  += HOST_MAILSERVER_ENABLE_MANAGESIEVE HOST_MAILSERVER_SPOOF_PROTECTION HOST_MAILSERVER_SSL_TYPE HOST_MAILSERVER_ENABLE_UPDATE_CHECK
+HOST_MAILSERVER_ENABLE_FAIL2BAN           ?= 1
 HOST_MAILSERVER_ENABLE_MANAGESIEVE        ?= 1
+HOST_MAILSERVER_ENABLE_UPDATE_CHECK       ?= 0
 HOST_MAILSERVER_SPOOF_PROTECTION          ?= 1
 HOST_MAILSERVER_SSL_TYPE                  ?= letsencrypt
-HOST_MAILSERVER_ENABLE_UPDATE_CHECK       ?= 0
 HOST_MAILSERVER_UFW_DOCKER                ?= 25/tcp 465/tcp 587/tcp 993/tcp

stack/host/mail/mailserver.yml

@@ -28,7 +28,7 @@ services:
     - ENABLE_AMAVIS=${HOST_MAILSERVER_ENABLE_AMAVIS:-1}
     - AMAVIS_LOGLEVEL=${HOST_MAILSERVER_AMAVIS_LOGLEVEL:-0}
     - ENABLE_DNSBL=${HOST_MAILSERVER_ENABLE_DNSBL:-0}
-    - ENABLE_FAIL2BAN=${HOST_MAILSERVER_ENABLE_FAIL2BAN:-0}
+    - ENABLE_FAIL2BAN=${HOST_MAILSERVER_ENABLE_FAIL2BAN:-1}
     - FAIL2BAN_BLOCKTYPE=${HOST_MAILSERVER_FAIL2BAN_BLOCKTYPE:-drop}
     - ENABLE_MANAGESIEVE=${HOST_MAILSERVER_ENABLE_MANAGESIEVE:-1}
     - POSTSCREEN_ACTION=${HOST_MAILSERVER_POSTSCREEN_ACTION:-enforce}
@@ -155,8 +155,3 @@ volumes:
   host:
     external: true
     name: ${HOST_DOCKER_VOLUME}
-
-networks:
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/host/nginx.dns.yml

@@ -9,4 +9,3 @@ services:
 
 volumes:
   dns:
-

stack/host/nginx.www.yml

@@ -7,4 +7,3 @@ services:
 
 volumes:
   www:
-

stack/host/nginx.yml

@@ -51,8 +51,3 @@ volumes:
   htpasswd:
   log:
   vhost:
-
-networks:
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/host/php.dns.yml

@@ -7,4 +7,3 @@ services:
 
 volumes:
   dns:
-

stack/host/php.www.yml

@@ -7,4 +7,3 @@ services:
 
 volumes:
   www:
-

stack/host/php.yml

@@ -14,8 +14,3 @@ services:
     networks:
     - public
     restart: always
-
-networks:
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/host/portainer.yml

@@ -21,8 +21,3 @@ services:
 
 volumes:
   portainer:
-
-networks:
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/host/static.yml

@@ -18,8 +18,3 @@ services:
 
 volumes:
   static:
-
-networks:
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/host/vdi/vdi.yml

@@ -40,11 +40,6 @@ services:
     - shared:/shared:cached
     - shm:/dev/shm:delegated
 
-networks:
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}
-
 volumes:
   home:
   shared:

stack/host/volumes.dns.local.yml

@@ -1,9 +0,0 @@
-version: '3.6'
-
-volumes:
-  dns:
-    driver: local
-    driver_opts:
-      device: /dns
-      o: bind
-      type: none

stack/host/volumes.home.local.yml

@@ -1,10 +0,0 @@
-version: '3.6'
-
-volumes:
-  home:
-    driver: local
-    driver_opts:
-      device: /home
-      o: bind
-      type: none
-

stack/host/volumes.log.local.yml

@@ -1,9 +0,0 @@
-version: '3.6'
-
-volumes:
-  log:
-    driver: local
-    driver_opts:
-      device: /var/log
-      o: bind
-      type: none

stack/host/volumes.www.local.yml

@@ -1,9 +0,0 @@
-version: '3.6'
-
-volumes:
-  www:
-    driver: local
-    driver_opts:
-      device: /var/www
-      o: bind
-      type: none

stack/ipfs/ipfs.yml

@@ -92,11 +92,3 @@ volumes:
       type: none
       device: ${HOME}/.ipfs
       o: bind
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/memcached/memcached.yml

@@ -11,8 +11,3 @@ services:
     ports:
     - 11211
     restart: always
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}

stack/mysql/mysql.yml

@@ -17,8 +17,3 @@ services:
 
 volumes:
   mysql:
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}

stack/newrelic/php-daemon.yml

@@ -12,8 +12,3 @@ services:
     ports:
     - 31339
     restart: always
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}

stack/nginx/nginx.yml

@@ -45,11 +45,3 @@ volumes:
       type: none
       device: ${MONOREPO_DIR}
       o: bind
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE:-docker}
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC:-localhost}

stack/nginx/static.yml

@@ -19,11 +19,3 @@ services:
 
 volumes:
   static:
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE:-docker}
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC:-static.localhost}

stack/portainer/portainer.yml

@@ -20,8 +20,3 @@ services:
 
 volumes:
   portainer:
-
-networks:
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/postgres/postgres.yml

@@ -20,8 +20,3 @@ services:
 
 volumes:
   postgres:
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}

stack/prometheus/alertmanager.yml

@@ -19,11 +19,3 @@ services:
     ports:
     - 9093
     restart: always
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/prometheus/blackbox.yml

@@ -18,11 +18,3 @@ services:
     ports:
     - 9115
     restart: always
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/prometheus/es-exporter.yml

@@ -19,11 +19,3 @@ services:
     ports:
     - 9206
     restart: always
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/prometheus/prometheus.yml

@@ -25,11 +25,3 @@ services:
 
 volumes:
   prometheus:
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/rabbitmq/rabbitmq.yml

@@ -25,11 +25,3 @@ services:
 
 volumes:
   rabbitmq:
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/redis/redis.yml

@@ -17,11 +17,3 @@ services:
 
 volumes:
   redis:
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/redmine/redmine.yml

@@ -37,11 +37,3 @@ services:
 
 volumes:
   redmine:
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/redmine/redmine3.yml

@@ -30,11 +30,3 @@ services:
 
 volumes:
   redmine3:
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/sematext/logagent.yml

@@ -21,8 +21,3 @@ services:
     restart: always
     volumes:
     - /var/run/docker.sock:/tmp/docker.sock
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}

stack/theia/theia.yml

@@ -46,11 +46,3 @@ volumes:
   user:
     external: true
     name: ${USER_DOCKER_VOLUME}
-
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/x2go/vdi.yml

@@ -40,14 +40,6 @@ services:
     - vdi-shared:/shared:cached
     - vdi-shm:/dev/shm:delegated
 
-networks:
-  private:
-    external: true
-    name: ${DOCKER_NETWORK_PRIVATE}
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}
-
 volumes:
   vdi-home:
   vdi-shared: