diff --git a/data/Dockerfiles/clamd/bootstrap.sh b/data/Dockerfiles/clamd/bootstrap.sh index 1d49cd20..2c54f992 100755 --- a/data/Dockerfiles/clamd/bootstrap.sh +++ b/data/Dockerfiles/clamd/bootstrap.sh @@ -48,6 +48,7 @@ while true; do sleep 2m SANE_MIRRORS="$(dig +ignore +short rsync.sanesecurity.net)" for sane_mirror in ${SANE_MIRRORS}; do + CE= rsync -avp --chown=clamav:clamav --chmod=Du=rwx,Dgo=rx,Fu=rw,Fog=r --timeout=5 rsync://${sane_mirror}/sanesecurity/ \ --include 'blurl.ndb' \ --include 'junk.ndb' \ @@ -61,7 +62,8 @@ while true; do --include 'sanesecurity.ftm' \ --include 'sigwhitelist.ign2' \ --exclude='*' /var/lib/clamav/ - if [ $? -eq 0 ]; then + chown 755 /var/lib/clamav/ + if [ ${CE} -eq 0 ]; then echo RELOAD | nc localhost 3310 break fi diff --git a/docker-compose.yml b/docker-compose.yml index 2246ab39..898fd09a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -55,7 +55,7 @@ services: - redis clamd-mailcow: - image: mailcow/clamd:1.23 + image: mailcow/clamd:1.24 build: ./data/Dockerfiles/clamd restart: always environment: @@ -225,7 +225,7 @@ services: - dovecot postfix-mailcow: - image: mailcow/postfix:1.32 + image: mailcow/postfix:1.33 build: ./data/Dockerfiles/postfix volumes: - ./data/conf/postfix:/opt/postfix/conf @@ -428,6 +428,24 @@ services: aliases: - solr + olefy-mailcow: + image: mailcow/olefy:1.0 + restart: always + build: ./data/Dockerfiles/olefy + environment: + - OLEFY_BINDADDRESS=0.0.0.0 + - OLEFY_BINDPORT=10055 + - OLEFY_TMPDIR=/tmp + - OLEFY_PYTHON_PATH=/usr/bin/python3 + - OLEFY_OLEVBA_PATH=/usr/bin/olevba3 + - OLEFY_LOGLVL=20 + - OLEFY_MINLENGTH=500 + - OLEFY_DEL_TMP=1 + networks: + mailcow-network: + aliases: + - olefy + ipv6nat-mailcow: depends_on: - unbound-mailcow