...
 
Commits (2)
#!/bin/bash
# Create temp directories
[[ ! -d /tmp/sa-rules-schaal ]] && mkdir -p /tmp/sa-rules-schaal
#[[ ! -d /tmp/sa-rules-schaal ]] && mkdir -p /tmp/sa-rules-schaal
[[ ! -d /tmp/sa-rules-heinlein ]] && mkdir -p /tmp/sa-rules-heinlein
# Hash current SA rules
......@@ -19,12 +19,12 @@ if gzip -t /tmp/sa-rules-heinlein.tar.gz; then
cat /tmp/sa-rules-heinlein/*cf > /etc/rspamd/custom/sa-rules
fi
## Schaal
curl --connect-timeout 15 --max-time 30 http://sa.schaal-it.net/$(dig txt 1.4.3.sa.schaal-it.net +short | tr -d '"').tar.gz --output /tmp/sa-rules-schaal.tar.gz
if gzip -t /tmp/sa-rules-schaal.tar.gz; then
tar xfvz /tmp/sa-rules-schaal.tar.gz -C /tmp/sa-rules-schaal
# Append, do not overwrite
cat /tmp/sa-rules-schaal/*cf >> /etc/rspamd/custom/sa-rules
fi
#curl --connect-timeout 15 --max-time 30 http://sa.schaal-it.net/$(dig txt 1.4.3.sa.schaal-it.net +short | tr -d '"').tar.gz --output /tmp/sa-rules-schaal.tar.gz
#if gzip -t /tmp/sa-rules-schaal.tar.gz; then
# tar xfvz /tmp/sa-rules-schaal.tar.gz -C /tmp/sa-rules-schaal
# # Append, do not overwrite
# cat /tmp/sa-rules-schaal/*cf >> /etc/rspamd/custom/sa-rules
#fi
sed -i -e 's/\([^\\]\)\$\([^\/]\)/\1\\$\2/g' /etc/rspamd/custom/sa-rules
......
......@@ -68,7 +68,7 @@ services:
- clamd
rspamd-mailcow:
image: mailcow/rspamd:1.54
image: mailcow/rspamd:1.55
build: ./data/Dockerfiles/rspamd
stop_grace_period: 30s
depends_on:
......@@ -174,7 +174,7 @@ services:
- sogo
dovecot-mailcow:
image: mailcow/dovecot:1.94
image: mailcow/dovecot:1.95
build: ./data/Dockerfiles/dovecot
dns:
- ${IPV4_NETWORK:-172.22.1}.254
......