Compare commits
5 Commits
f6185d6443
...
45816eb74a
Author | SHA1 | Date |
---|---|---|
Jim Hague | 45816eb74a | |
Jim Hague | 32ce2b1a08 | |
Jim Hague | 6466609192 | |
Jim Hague | 496226815d | |
Jim Hague | 46549c6863 |
|
@ -1,7 +1,8 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
#
|
#
|
||||||
# Copy dehydrated generated certs into /var/local/certificates and
|
# Copy dehydrated generated certs into /var/local/certificates and
|
||||||
# set required ownership. Also restart local services as appropriate.
|
# set required ownership and permissions. Also restart local services
|
||||||
|
# as appropriate.
|
||||||
|
|
||||||
action=$1
|
action=$1
|
||||||
shift
|
shift
|
||||||
|
@ -9,6 +10,8 @@ shift
|
||||||
deploy_cert() {
|
deploy_cert() {
|
||||||
cp -a /var/lib/dehydrated/certs/* /var/local/certificates/
|
cp -a /var/lib/dehydrated/certs/* /var/local/certificates/
|
||||||
chown -R root:ssl-cert /var/local/certificates/
|
chown -R root:ssl-cert /var/local/certificates/
|
||||||
|
find /var/local/certificates/ -type d -print0 | xargs -0 chmod g+rx
|
||||||
|
find /var/local/certificates/ -type f -print0 | xargs -0 chmod g+r
|
||||||
|
|
||||||
DOMAIN="$1"
|
DOMAIN="$1"
|
||||||
case $DOMAIN in
|
case $DOMAIN in
|
||||||
|
|
|
@ -19,8 +19,10 @@
|
||||||
#deny message = Message discarded as high-probability spam
|
#deny message = Message discarded as high-probability spam
|
||||||
# condition = ${if eq{$spam_action}{reject}}
|
# condition = ${if eq{$spam_action}{reject}}
|
||||||
|
|
||||||
|
# This is an additional check to Mythic's rspamd, so don't
|
||||||
|
# remove any spam judgement that has made.
|
||||||
# Remove foreign headers
|
# Remove foreign headers
|
||||||
warn remove_header = x-spam-bar : x-spam-score : x-spam-report : x-spam-status
|
#warn remove_header = x-spam-bar : x-spam-score : x-spam-report : x-spam-status
|
||||||
|
|
||||||
# add spam-score and spam-report header when "add header" action is recommended by rspamd
|
# add spam-score and spam-report header when "add header" action is recommended by rspamd
|
||||||
warn
|
warn
|
||||||
|
|
|
@ -12,6 +12,10 @@ rspamd:
|
||||||
- name: rspamd
|
- name: rspamd
|
||||||
- fromrepo: bullseye
|
- fromrepo: bullseye
|
||||||
|
|
||||||
|
redis_server:
|
||||||
|
pkg.installed:
|
||||||
|
- name: redis-server
|
||||||
|
|
||||||
rspamd_conf:
|
rspamd_conf:
|
||||||
file.recurse:
|
file.recurse:
|
||||||
- name: /etc/rspamd/local.d
|
- name: /etc/rspamd/local.d
|
||||||
|
@ -26,3 +30,10 @@ rspamd_service:
|
||||||
- watch:
|
- watch:
|
||||||
- pkg: rspamd
|
- pkg: rspamd
|
||||||
- file: /etc/rspamd/local.d
|
- file: /etc/rspamd/local.d
|
||||||
|
|
||||||
|
redis_service:
|
||||||
|
service.running:
|
||||||
|
- name: redis-server
|
||||||
|
- enable: true
|
||||||
|
- watch:
|
||||||
|
- pkg: redis-server
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
# We're receiving from Mythic's mailservers, so no point greylisting.
|
||||||
|
enabled = false
|
|
@ -0,0 +1,2 @@
|
||||||
|
# We're receiving from Mythic's mailservers, who have already done RBL.
|
||||||
|
enabled = false
|
Loading…
Reference in New Issue