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

data/hooks/conf_regen/28-rmilter

@@ -18,9 +18,12 @@ cd /usr/share/yunohost/templates/rmilter
 # Copy Rmilter configuration
 safe_copy rmilter.conf /etc/rmilter.conf
 
+# Override socket configuration
+safe_copy rmilter.socket /etc/systemd/system/rmilter.socket
+
 # Create the PID directory
-sudo mkdir -p /var/run/rmilter
-sudo chown _rmilter: /var/run/rmilter
+sudo mkdir -p /run/rmilter
+sudo chown -hR _rmilter: /run/rmilter
 
 # Create DKIM key for each YunoHost domain
 sudo mkdir -p /etc/dkim
@@ -38,4 +41,7 @@ for domain in $domain_list; do
     sudo chmod 400      /etc/dkim/$domain.mail.key
 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

data/templates/rmilter/rmilter.conf

@@ -1,18 +1,18 @@
 # 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
-bind_socket = inet:11000@localhost;
+# rmilter is socket-activated under systemd
+bind_socket = fd:3;
 
 # DKIM signing
 dkim {
-        domain {
-                key = /etc/dkim;
-                domain = "*";
-                selector = "mail";
-        };
+    domain {
+        key = /etc/dkim;
+        domain = "*";
+        selector = "mail";
+    };
 };
-

data/templates/rmilter/rmilter.socket

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

debian/control

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