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

Merge remote-tracking branch 'origin/unstable' into unstable

Browse source
This commit is contained in:
Weblate 2015-12-31 13:00:44 +01:00
commit 75ef2622ff
4 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,9 +18,12 @@ cd /usr/share/yunohost/templates/rmilter
# Copy Rmilter configuration # Copy Rmilter configuration
safe_copy rmilter.conf /etc/rmilter.conf safe_copy rmilter.conf /etc/rmilter.conf
# Override socket configuration
safe_copy rmilter.socket /etc/systemd/system/rmilter.socket
# Create the PID directory # Create the PID directory
sudo mkdir -p /var/run/rmilter sudo mkdir -p /run/rmilter
sudo chown _rmilter: /var/run/rmilter sudo chown -hR _rmilter: /run/rmilter
# Create DKIM key for each YunoHost domain # Create DKIM key for each YunoHost domain
sudo mkdir -p /etc/dkim sudo mkdir -p /etc/dkim
@ -38,4 +41,7 @@ for domain in $domain_list; do
sudo chmod 400 /etc/dkim/$domain.mail.key sudo chmod 400 /etc/dkim/$domain.mail.key
done done
sudo service rmilter restart # Reload systemd daemon and stop rmilter service to take into account the
# new configuration. It will be started again by the socket as needed.
sudo systemctl daemon-reload
sudo systemctl stop rmilter.service 2>&1 || true

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

@ -1,18 +1,18 @@
# systemd-specific settings for rmilter # systemd-specific settings for rmilter
.include /etc/rmilter.conf.common .include /etc/rmilter.conf.common
pidfile = /var/run/rmilter/rmilter.pid; # pidfile - path to pid file
pidfile = /run/rmilter/rmilter.pid;
# listen on TCP socket # rmilter is socket-activated under systemd
bind_socket = inet:11000@localhost; bind_socket = fd:3;
# DKIM signing # DKIM signing
dkim { dkim {
domain { domain {
key = /etc/dkim; key = /etc/dkim;
domain = "*"; domain = "*";
selector = "mail"; selector = "mail";
}; };
}; };

5
data/templates/rmilter/rmilter.socket Normal file
View file

@ -0,0 +1,5 @@
.include /lib/systemd/system/rmilter.socket
[Socket]
ListenStream=
ListenStream=127.0.0.1:11000

1
debian/control vendored
View file

@ -37,6 +37,7 @@ Depends: ${python:Depends}, ${misc:Depends},
rspamd, rmilter, memcached, opendkim-tools rspamd, rmilter, memcached, opendkim-tools
Recommends: yunohost-admin, Recommends: yunohost-admin,
bash-completion, rsyslog, ntp, openssh-server, bash-completion, rsyslog, ntp, openssh-server,
inetutils-ping | iputils-ping,
php5-gd, php5-curl, php-gettext, php5-mcrypt, php5-gd, php5-curl, php-gettext, php5-mcrypt,
udisks-glue, unattended-upgrades, udisks-glue, unattended-upgrades,
libdbd-ldap-perl, libnet-dns-perl libdbd-ldap-perl, libnet-dns-perl