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

Fixes in DKIM generation in rspamd regen-conf

Browse source
This commit is contained in:
Alexandre Aubin 2017-08-27 14:25:15 +02:00
parent e43a335106
commit 73523097de
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
data/hooks/conf_regen/31-rspamd
View file

@ -14,21 +14,22 @@ do_pre_regen() {
} }
do_post_regen() { do_post_regen() {
regen_conf_files=$1
[ -z "$regen_conf_files" ] && exit 0 ##
## DKIM key generation
# retrieve variables ##
domain_list=$(sudo yunohost domain list --output-as plain --quiet)
# create DKIM directory with proper permission # create DKIM directory with proper permission
sudo mkdir -p /etc/dkim sudo mkdir -p /etc/dkim
sudo chown _rspamd /etc/dkim sudo chown _rspamd /etc/dkim
# retrieve domain list
domain_list=$(sudo yunohost domain list --output-as plain --quiet)
# create DKIM key for domains # create DKIM key for domains
for domain in "$domain_list"; do for domain in $domain_list; do
domain_key="/etc/dkim/${domain}.mail.key" domain_key="/etc/dkim/${domain}.mail.key"
[ ! -f $domain_key ] && { [ ! -f "$domain_key" ] && {
sudo opendkim-genkey --domain="$domain" \ sudo opendkim-genkey --domain="$domain" \
--selector=mail --directory=/etc/dkim --selector=mail --directory=/etc/dkim
sudo mv /etc/dkim/mail.private "$domain_key" sudo mv /etc/dkim/mail.private "$domain_key"
@ -40,6 +41,9 @@ do_post_regen() {
sudo chown _rspamd /etc/dkim/*.mail.key sudo chown _rspamd /etc/dkim/*.mail.key
sudo chmod 400 /etc/dkim/*.mail.key sudo chmod 400 /etc/dkim/*.mail.key
regen_conf_files=$1
[ -z "$regen_conf_files" ] && exit 0
# compile sieve script # compile sieve script
[[ "$regen_conf_files" =~ rspamd\.sieve ]] && { [[ "$regen_conf_files" =~ rspamd\.sieve ]] && {
sudo sievec /etc/dovecot/global_script/rspamd.sieve sudo sievec /etc/dovecot/global_script/rspamd.sieve