Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51055cc3 authored by Akhil's avatar Akhil 🙂
Browse files

Merge branch 'smu44-master-patch-93709' into 'master' 

Rspamd domain filtering enhancements

See merge request !83
parents c550f011 9318cb8e

config/mail/rspamd/ecloud/blacklist.sender.domain.map

0 → 100644
+1 −0
Original line number Diff line number Diff line 
# Blacklisted sender domains, one per line

config/mail/rspamd/multimap.conf

+8 −1
Original line number Diff line number Diff line 
WHITELIST_SENDER_DOMAIN {

    type = "from";

    filter = "email:domain";

    map = "/etc/rspamd/local.d/whitelist.sender.domain.map";

    map = "/etc/rspamd/local.d/ecloud/whitelist.sender.domain.map";

    score = -6.0

}



BLACKLIST_SENDER_DOMAIN {

    type = "from";

    filter = "email:domain";

    map = "/etc/rspamd/local.d/ecloud/blacklist.sender.domain.map";

    score = 99.0

}

scripts/init-repo.sh

+5 −1
Original line number Diff line number Diff line
@@ -83,7 +83,11 @@ cat templates/automx/automx.conf | sed "s/@@@DOMAIN@@@/$DOMAIN/g" > "config/auto 
chown www-data:www-data "config/automx/automx.conf"



# Configure rspamd whitelist

cat templates/mail/rspamd/whitelist.sender.domain.map | sed "s/@@@DOMAIN@@@/$DOMAIN/g" > "config/mail/rspamd/whitelist.sender.domain.map"

cat templates/mail/rspamd/ecloud/whitelist.sender.domain.map | sed "s/@@@DOMAIN@@@/$DOMAIN/g" > "config/mail/rspamd/ecloud/whitelist.sender.domain.map"



# Allow white/black lists editing

chown -R 107:109 "config/mail/rspamd/ecloud/"





# Configure nginx vhost

templates/docker-compose/docker-compose.yml

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ services: 
      - /mnt/repo-base/config/mail/dovecot/90-quota.conf:/etc/dovecot/conf.d/90-quota.conf

      - /mnt/repo-base/config/mail/dovecot/90-sieve.conf:/etc/dovecot/conf.d/90-sieve.conf

      - /mnt/repo-base/config/mail/rspamd/multimap.conf:/etc/rspamd/local.d/multimap.conf

      - /mnt/repo-base/config/mail/rspamd/whitelist.sender.domain.map:/etc/rspamd/local.d/whitelist.sender.domain.map

      - /mnt/repo-base/config/mail/rspamd/ecloud:/etc/rspamd/local.d/ecloud

      - /mnt/repo-base/config/mail/rspamd/ratelimit.conf:/etc/rspamd/local.d/ratelimit.conf

      - /mnt/repo-base/config/mail/clamav/freshclam.conf:/etc/clamav/freshclam.conf

    depends_on:

templates/mail/rspamd/ecloud/whitelist.sender.domain.map

0 → 100644
+1 −0
Original line number Diff line number Diff line 
@@@DOMAIN@@@