diff --git a/docker-compose.yml b/docker-compose.yml index 812a25e..d653636 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -226,16 +226,24 @@ services: - ENABLE_CLAMAV=1 - ENABLE_FAIL2BAN=1 - ENABLE_POSTGREY=0 + - ENABLE_UPDATE_CHECK=1 + # not sure if =0 disables these? + - ENABLE_POP3=0 + - ENABLE_MANAGESIEVE=0 +# Adding these, for future testing +# - ENABLE_DNSBL=0 +# - ENABLE_OPENDKIM=0 +# - ENABLE_OPENDMARC=0 +# - FAIL2BAN_BLOCKTYPE=drop +# - ENABLE_RSPAMD=1 +# presume if we do the above, we should turn off the spamassassin checks, but could do both I guess? - SPOOF_PROTECTION=1 - ONE_DIR=1 - DMS_DEBUG=0 - LOG_LEVEL=warn - AMAVIS_LOGLEVEL=-1 - # in theory these next 2 being empty disables them, but that does not seem to work - - ENABLE_POP3 - - ENABLE_MANAGESIEVE - ACCOUNT_PROVISIONER=LDAP - - LDAP_SERVER_HOST=192.168.0.2 # your ldap container/IP/ServerName + - LDAP_SERVER_HOST=192.168.0.2 # using IP, as we changed over container names (openldap->openldapnew) - LDAP_SEARCH_BASE=dc=depaoli,dc=id,dc=au - LDAP_BIND_DN=cn=admin,dc=depaoli,dc=id,dc=au - LDAP_BIND_PW=a_real_admin_pass_word_for_2o20 @@ -829,7 +837,7 @@ services: - "/etc/localtime:/etc/localtime:ro" wiki: - image: requarks/wiki:2 + image: requarks/wiki:latest container_name: wiki depends_on: - openldap @@ -982,18 +990,19 @@ services: container_name: sshwifty user: "nobody:nobody" restart: always - ports: - - "8182:8182/tcp" labels: - "com.centurylinklabs.watchtower.enable=true" - "traefik.enable=true" - "traefik.http.routers.sshwifty.rule=Host(`ssh.depaoli.id.au`)" - "traefik.http.routers.sshwifty.tls=true" + - "traefik.http.routers.sshwifty.entrypoints=secureweb" stdin_open: true tty: true volumes: - "/srv/docker/container/sshwifty/:/etc/" - "/etc/localtime:/etc/localtime:ro" +# ports: +# - "8182:8182/tcp" # myth? # this: https://github.com/delnaught/mythtv-containers/blob/main/compose-mythtv/docker-compose.yml