From aebd24ec5485dacc5146728fa22387340b51099e Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Tue, 2 Jul 2013 20:09:27 +1000 Subject: [PATCH 1/3] BF: replace with ed so its cross platform, fixes permission problem gh-266, and Yaroslav doesn't revert to perl --- ChangeLog | 2 ++ config/action.d/hostsdeny.conf | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e5c38eb1..51835de4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,8 @@ ver. 0.8.11 (2013/XX/XXX) - wanna-be-released * filter.d/common.conf -- make colon after [daemon] optional. Closes gh-267 * filter.d/apache-common.conf -- support apache 2.4 more detailed error log format. Closes gh-268 + Daniel Black + * action.d/hostsdeny -- ensure permissions are fixed - gh-266 - New Features: Daniel Black & ykimon * filter.d/3proxy.conf -- filter added diff --git a/config/action.d/hostsdeny.conf b/config/action.d/hostsdeny.conf index 50a4545c..36e34948 100644 --- a/config/action.d/hostsdeny.conf +++ b/config/action.d/hostsdeny.conf @@ -39,7 +39,7 @@ actionban = IP= && # Tags: See jail.conf(5) man page # Values: CMD # -actionunban = IP= && sed /ALL:\ $IP/d > .new && mv .new +actionunban = echo "/ALL: $/
d
w
q" | ed [Init] From 256f60adae92933b2fa7e9099103b95a54b90478 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Wed, 3 Jul 2013 09:01:24 +1000 Subject: [PATCH 2/3] DOC: improved log message --- ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 51835de4..5331e4a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,7 +16,8 @@ ver. 0.8.11 (2013/XX/XXX) - wanna-be-released * filter.d/apache-common.conf -- support apache 2.4 more detailed error log format. Closes gh-268 Daniel Black - * action.d/hostsdeny -- ensure permissions are fixed - gh-266 + * action.d/hostsdeny -- Switched to use 'ed' available across all + platforms to ensure permissions are the same before and after a ban - gh-266 - New Features: Daniel Black & ykimon * filter.d/3proxy.conf -- filter added From 174e3dba6dc5bfc44d34f02c68f5dee459cc7b92 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Tue, 9 Jul 2013 08:36:53 +1000 Subject: [PATCH 3/3] DOC: Note on new dependency - ed for hosts_deny --- ChangeLog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5331e4a0..d02601c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,8 +16,9 @@ ver. 0.8.11 (2013/XX/XXX) - wanna-be-released * filter.d/apache-common.conf -- support apache 2.4 more detailed error log format. Closes gh-268 Daniel Black - * action.d/hostsdeny -- Switched to use 'ed' available across all - platforms to ensure permissions are the same before and after a ban - gh-266 + * action.d/hostsdeny -- NOTE: new dependancy 'ed'. Switched to use 'ed' across + all platforms to ensure permissions are the same before and after a ban - + closes gh-266 - New Features: Daniel Black & ykimon * filter.d/3proxy.conf -- filter added