[packages/fail2ban] - up to 0.9.4; fix pidfile handling
arekm
arekm at pld-linux.org
Fri Mar 17 15:29:20 CET 2017
commit d379a00482d50562a1738dc904382f6235a54427
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri Mar 17 15:29:14 2017 +0100
- up to 0.9.4; fix pidfile handling
fail2ban.init | 10 +++++-----
fail2ban.spec | 4 ++--
logifiles.patch | 7 -------
3 files changed, 7 insertions(+), 14 deletions(-)
---
diff --git a/fail2ban.spec b/fail2ban.spec
index 72a1478..216be4b 100644
--- a/fail2ban.spec
+++ b/fail2ban.spec
@@ -3,12 +3,12 @@
Summary: Ban IPs that make too many password failures
Summary(pl.UTF-8): Blokowanie IP powodujących zbyt dużo prób logowań z błędnym hasłem
Name: fail2ban
-Version: 0.9.1
+Version: 0.9.4
Release: 0.1
License: GPL
Group: Daemons
Source0: https://github.com/fail2ban/fail2ban/archive/%{version}.tar.gz
-# Source0-md5: 3554cc3de3f06ddfd7f90f8305b765b8
+# Source0-md5: 2dc93dff03c4da9fb95d4695e07b65d8
Source1: %{name}.init
Source2: %{name}.logrotate
Source3: paths-pld.conf
diff --git a/fail2ban.init b/fail2ban.init
index 7e72f87..a9c69e9 100644
--- a/fail2ban.init
+++ b/fail2ban.init
@@ -6,7 +6,7 @@
# description: Fail2ban daemon
# http://fail2ban.sourceforge.net/wiki/index.php/Main_Page
# process name: fail2ban-server
-# pidfile: /var/run/fail2ban.pid
+# pidfile: /var/run/fail2ban/fail2ban.pid
# config: /etc/fail2ban/fail2ban.conf
#
@@ -36,7 +36,7 @@ start() {
# Check if the service is already running?
if [ ! -f /var/lock/subsys/fail2ban ]; then
msg_starting fail2ban
- daemon /usr/bin/fail2ban-client start
+ daemon --pidfile /var/run/fail2ban/fail2ban.pid /usr/bin/fail2ban-client start
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/fail2ban
else
@@ -48,8 +48,8 @@ stop() {
# Stop daemons.
if [ -f /var/lock/subsys/fail2ban ]; then
msg_stopping fail2ban
- daemon /usr/bin/fail2ban-client stop
- rm -f /var/lock/subsys/fail2ban /var/run/fail2ban.pid >/dev/null 2>&1
+ daemon --pidfile /var/run/fail2ban/fail2ban.pid /usr/bin/fail2ban-client stop
+ rm -f /var/lock/subsys/fail2ban /var/run/fail2ban/fail2ban.pid >/dev/null 2>&1
else
msg_not_running fail2ban
fi
@@ -85,7 +85,7 @@ case "$1" in
condrestart 7
;;
status)
- status fail2ban
+ status --pidfile /var/run/fail2ban/fail2ban.pid fail2ban
RETVAL=$?
/usr/bin/fail2ban-client status
;;
diff --git a/logifiles.patch b/logifiles.patch
index 30c6e0d..29c8b6d 100644
--- a/logifiles.patch
+++ b/logifiles.patch
@@ -9,10 +9,3 @@
# The DEFAULT allows a global definition of the options. They can be overridden
# in each jail afterwards.
-@@ -723,4 +723,4 @@
- [portsentry]
- enabled = false
- logpath = /var/lib/portsentry/portsentry.history
--maxretry = 1
-\ Brak znaku nowej linii na końcu pliku
-+maxretry = 1
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/fail2ban.git/commitdiff/d379a00482d50562a1738dc904382f6235a54427
More information about the pld-cvs-commit
mailing list