From 1dce67d97a586c8556098f2f26709982509af513 Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 2 Jun 2017 15:48:45 +0100
Subject: [Minor] More rework in renaming rmilter -> milter

---
 conf/modules.d/milter_headers.conf  | 30 ++++++++++++++++++++++++++++++
 conf/modules.d/rmilter_headers.conf | 25 -------------------------
 2 files changed, 30 insertions(+), 25 deletions(-)
 create mode 100644 conf/modules.d/milter_headers.conf
 delete mode 100644 conf/modules.d/rmilter_headers.conf

(limited to 'conf/modules.d')

diff --git a/conf/modules.d/milter_headers.conf b/conf/modules.d/milter_headers.conf
new file mode 100644
index 000000000..49eef6908
--- /dev/null
+++ b/conf/modules.d/milter_headers.conf
@@ -0,0 +1,30 @@
+# Please don't modify this file as your changes might be overwritten with
+# the next update.
+#
+# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
+# parameters defined on the top level
+#
+# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
+# parameters defined on the top level
+#
+# For specific modules or configuration you can also modify
+# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+#
+# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+
+rmilter_headers {
+
+  # Refer to https://rspamd.com/doc/modules/milter_headers.html for information on configuration
+
+  use = [];
+
+  # Compatibility
+  .include(try=true,priority=5) "${DBDIR}/dynamic/rmilter_headers.conf"
+  .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/rmilter_headers.conf"
+  .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/rmilter_headers.conf"
+
+  .include(try=true,priority=5) "${DBDIR}/dynamic/milter_headers.conf"
+  .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/milter_headers.conf"
+  .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/milter_headers.conf"
+}
diff --git a/conf/modules.d/rmilter_headers.conf b/conf/modules.d/rmilter_headers.conf
deleted file mode 100644
index 432057e03..000000000
--- a/conf/modules.d/rmilter_headers.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# Please don't modify this file as your changes might be overwritten with
-# the next update.
-#
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
-#
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
-#
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
-#
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
-
-rmilter_headers {
-
-  # Refer to https://rspamd.com/doc/modules/rmilter_headers.html for information on configuration
-
-  use = [];
-
-  .include(try=true,priority=5) "${DBDIR}/dynamic/rmilter_headers.conf"
-  .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/rmilter_headers.conf"
-  .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/rmilter_headers.conf"
-}
-- 
cgit v1.2.3