From f4a74d8d8b15dd8bfb860834c9ec37fc79a3ceb6 Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Mon, 22 Apr 2013 22:42:09 -0400
Subject: [PATCH] RF: rename/unify naming of courier filters/jails

---
 config/filter.d/{courierlogin.conf => courier-auth.conf} | 0
 config/filter.d/{couriersmtp.conf => courier-smtp.conf}  | 0
 config/jail.conf                                         | 5 ++---
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename config/filter.d/{courierlogin.conf => courier-auth.conf} (100%)
 rename config/filter.d/{couriersmtp.conf => courier-smtp.conf} (100%)

diff --git a/config/filter.d/courierlogin.conf b/config/filter.d/courier-auth.conf
similarity index 100%
rename from config/filter.d/courierlogin.conf
rename to config/filter.d/courier-auth.conf
diff --git a/config/filter.d/couriersmtp.conf b/config/filter.d/courier-smtp.conf
similarity index 100%
rename from config/filter.d/couriersmtp.conf
rename to config/filter.d/courier-smtp.conf
diff --git a/config/jail.conf b/config/jail.conf
index f7b3ee04..2021f865 100644
--- a/config/jail.conf
+++ b/config/jail.conf
@@ -363,7 +363,7 @@ maxretry = 6
 # Mail servers
 #
 
-[couriersmtp]
+[courier-smtp]
 
 port     = smtp,ssmtp
 logpath  = /var/log/mail.log
@@ -389,10 +389,9 @@ bantime  = 300
 # all relevant ports get banned
 #
 
-[courierauth]
+[courier-auth]
 
 port     = smtp,ssmtp,imap2,imap3,imaps,pop3,pop3s
-filter   = courierlogin
 logpath  = /var/log/mail.log