From bde8b02fef54d0d8a9c622b2132cb0b6f981674e Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alexandre.aubin@cern.ch>
Date: Fri, 7 Jul 2017 23:56:02 +0000
Subject: [PATCH] Removing some rmilter-related conf

---
 data/hooks/conf_regen/28-rmilter     | 80 ----------------------------
 data/templates/rmilter/rmilter.conf  | 28 ----------
 data/templates/yunohost/services.yml |  4 +-
 3 files changed, 1 insertion(+), 111 deletions(-)
 delete mode 100755 data/hooks/conf_regen/28-rmilter
 delete mode 100644 data/templates/rmilter/rmilter.conf

diff --git a/data/hooks/conf_regen/28-rmilter b/data/hooks/conf_regen/28-rmilter
deleted file mode 100755
index f505b6d99..000000000
--- a/data/hooks/conf_regen/28-rmilter
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-
-set -e
-
-do_pre_regen() {
-  pending_dir=$1
-
-  cd /usr/share/yunohost/templates/rmilter
-
-  # Install main configuration
-  install -D -m 644 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)
-  # Regen-conf system need an empty file to delete it
-  install -D -m 644 /dev/null \
-    "${pending_dir}/etc/systemd/system/rmilter.socket"
-}
-
-do_post_regen() {
-  regen_conf_files=$1
-
-  # retrieve variables
-  domain_list=$(sudo yunohost domain list --output-as plain --quiet)
-
-  # create DKIM directory with proper permission
-  sudo mkdir -p /etc/dkim
-  sudo chown _rmilter /etc/dkim
-
-  # create DKIM key for domains
-  for domain in $domain_list; do
-    domain_key="/etc/dkim/${domain}.mail.key"
-    [ ! -f $domain_key ] && {
-      sudo opendkim-genkey --domain="$domain" \
-          --selector=mail --directory=/etc/dkim
-      sudo mv /etc/dkim/mail.private "$domain_key"
-      sudo mv /etc/dkim/mail.txt "/etc/dkim/${domain}.mail.txt"
-    }
-  done
-
-  # fix DKIM keys permissions
-  sudo chown _rmilter /etc/dkim/*.mail.key
-  sudo chmod 400 /etc/dkim/*.mail.key
-
-  # fix rmilter socket permission (postfix is chrooted in /var/spool/postfix )
-  sudo mkdir -p /var/spool/postfix/run/rmilter
-  sudo chown -R postfix:_rmilter /var/spool/postfix/run/rmilter
-  sudo chmod g+w /var/spool/postfix/run/rmilter
-
-  [ -z "$regen_conf_files" ] && exit 0
-
-  # reload systemd daemon
-  sudo systemctl -q daemon-reload
-
-  # Restart rmilter due to the rspamd update
-  # https://rspamd.com/announce/2016/08/01/rspamd-1.3.1.html
-  sudo systemctl -q restart rmilter.service
-}
-
-FORCE=${2:-0}
-DRY_RUN=${3:-0}
-
-case "$1" in
-  pre)
-    do_pre_regen $4
-    ;;
-  post)
-    do_post_regen $4
-    ;;
-  *)
-    echo "hook called with unknown argument \`$1'" >&2
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/data/templates/rmilter/rmilter.conf b/data/templates/rmilter/rmilter.conf
deleted file mode 100644
index dcd13e9b7..000000000
--- a/data/templates/rmilter/rmilter.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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
-
-# pidfile - path to pid file
-pidfile = /run/rmilter/rmilter.pid;
-
-bind_socket = unix:/var/spool/postfix/run/rmilter/rmilter.sock;
-
-# include user's configuration
-.try_include /etc/rmilter.conf.local
-.try_include /etc/rmilter.conf.d/*.conf
diff --git a/data/templates/yunohost/services.yml b/data/templates/yunohost/services.yml
index fb8c076f9..e3900f87e 100644
--- a/data/templates/yunohost/services.yml
+++ b/data/templates/yunohost/services.yml
@@ -16,9 +16,6 @@ dovecot:
 postfix:
    status: service
    log: [/var/log/mail.log,/var/log/mail.err]
-rmilter:
-   status: systemctl status rmilter.service
-   log: /var/log/mail.log
 rspamd:
    status: systemctl status rspamd.service
    log: /var/log/mail.log
@@ -60,3 +57,4 @@ udisk-glue: null
 amavis: null
 postgrey: null
 spamassassin: null
+rmilter: null