YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] Update Rmilter configuration to fix dkim signing.

Browse source
This commit is contained in:
opi 2017-02-14 16:23:49 +01:00
parent 81915150b2
commit 1c2de37f63
3 changed files with 41 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data/hooks/conf_regen/28-rmilter
View file

@ -7,8 +7,14 @@ do_pre_regen() {
cd /usr/share/yunohost/templates/rmilter cd /usr/share/yunohost/templates/rmilter
# Install main configuration
install -D -m 644 rmilter.conf \ install -D -m 644 rmilter.conf \
"${pending_dir}/etc/rmilter.conf" "${pending_dir}/etc/rmilter.conf"
# Install DKIM specific configuration
install -D -m 644 ynh_dkim.conf \
"${pending_dir}/etc/rmilter.conf.d/ynh_dkim.conf"
# Remove old socket file (we stopped using it, since rspamd 1.3.1) # Remove old socket file (we stopped using it, since rspamd 1.3.1)
# Regen-conf system need an empty file to delete it # Regen-conf system need an empty file to delete it
install -D -m 644 /dev/null \ install -D -m 644 /dev/null \
@ -21,8 +27,9 @@ do_post_regen() {
# retrieve variables # retrieve variables
domain_list=$(sudo yunohost domain list --output-as plain --quiet) domain_list=$(sudo yunohost domain list --output-as plain --quiet)
# create DKIM directory # create DKIM directory with proper permission
sudo mkdir -p /etc/dkim sudo mkdir -p /etc/dkim
sudo chown _rmilter /etc/dkim
# create DKIM key for domains # create DKIM key for domains
for domain in $domain_list; do for domain in $domain_list; do

27
data/templates/rmilter/rmilter.conf
View file

@ -1,5 +1,21 @@
# systemd-specific settings for rmilter # systemd-specific settings for rmilter
# DKIM signing
# Defined before including /etc/rmilter.conf.common because rmilter seems to be
# unable to override dkim{} settings, even if it's already defined in
# /etc/rmilter.conf.d/ynh_dkim.conf
dkim {
enable = true;
domain {
key = /etc/dkim;
domain = "*";
selector = "mail";
};
header_canon = relaxed;
body_canon = relaxed;
sign_alg = sha256;
};
.include /etc/rmilter.conf.common .include /etc/rmilter.conf.common
# pidfile - path to pid file # pidfile - path to pid file
@ -7,11 +23,6 @@ pidfile = /run/rmilter/rmilter.pid;
bind_socket = unix:/var/spool/postfix/run/rmilter/rmilter.sock; bind_socket = unix:/var/spool/postfix/run/rmilter/rmilter.sock;
# DKIM signing # include user's configuration
dkim { .try_include /etc/rmilter.conf.local
domain { .try_include /etc/rmilter.conf.d/*.conf
key = /etc/dkim;
domain = "*";
selector = "mail";
};
};

14
data/templates/rmilter/ynh_dkim.conf Normal file
View file

@ -0,0 +1,14 @@
# DKIM signing
# Note that DKIM signing should be done by rspamd in the near future
# See https://github.com/vstakhov/rmilter/issues/174
dkim {
enable = true;
domain {
key = /etc/dkim;
domain = "*";
selector = "mail";
};
header_canon = relaxed;
body_canon = relaxed;
sign_alg = sha256;
};