github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1435 from sebres/fix-1434 

fixed --pidfile bug, introduced in gh-1322
pull/1439/head
sebres 2016-05-20 11:01:37 +02:00
parent d6eae28eb5 932708de9e
commit caecb2080b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -18,6 +18,8 @@ ver. 0.9.5 (2016/XX/XXX) - wanna-be-released
* fixed a grave bug within tags substitutions because of incorrect detection of recursion * fixed a grave bug within tags substitutions because of incorrect detection of recursion
in case of multiple inline substitutions of the same tag (affected actions: `bsd-ipfw`, etc). in case of multiple inline substitutions of the same tag (affected actions: `bsd-ipfw`, etc).
Now tracks the actual list of the already substituted tags (per tag instead of single list) Now tracks the actual list of the already substituted tags (per tag instead of single list)
* gentoo-initd fixed --pidfile bug: `--pidfile` is option of start-stop-daemon,
not argument of fail2ban (see gh-1434)
- New Features: - New Features:
* New Actions: * New Actions:

8
files/gentoo-initd
View File

@ -34,15 +34,15 @@ start() {
# remove stalled sock file after system crash # remove stalled sock file after system crash
# bug 347477 # bug 347477
rm -f /var/run/fail2ban/fail2ban.sock || return 1 rm -f /var/run/fail2ban/fail2ban.sock || return 1
start-stop-daemon --start --exec ${FAIL2BAN} start \ start-stop-daemon --start --pidfile /var/run/fail2ban/fail2ban.pid \
--pidfile /var/run/fail2ban/fail2ban.pid -- ${FAIL2BAN} start
eend $? "Failed to start fail2ban" eend $? "Failed to start fail2ban"
} }
stop() { stop() {
ebegin "Stopping fail2ban" ebegin "Stopping fail2ban"
start-stop-daemon --stop --exec ${FAIL2BAN} stop \ start-stop-daemon --stop --pidfile /var/run/fail2ban/fail2ban.pid \
--pidfile /var/run/fail2ban/fail2ban.pid -- ${FAIL2BAN} stop
eend $? "Failed to stop fail2ban" eend $? "Failed to stop fail2ban"
} }