summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/denyhosts.init2
-rw-r--r--debian/patches/02_FHS.patch4
-rw-r--r--debian/patches/03_default-config.patch4
3 files changed, 5 insertions, 5 deletions
diff --git a/debian/denyhosts.init b/debian/denyhosts.init
index 85365ae..7e0203b 100644
--- a/debian/denyhosts.init
+++ b/debian/denyhosts.init
@@ -28,7 +28,7 @@ DESC="DenyHosts"
NAME=denyhosts
DAEMON=/usr/bin/python
DAEMONCTL=/usr/share/denyhosts/denyhosts_ctl.py
-PIDFILE=/var/run/$NAME.pid
+PIDFILE=/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
CONFIG=/etc/denyhosts.conf
FLAGS="--purge --config=$CONFIG"
diff --git a/debian/patches/02_FHS.patch b/debian/patches/02_FHS.patch
index 755f6e8..24d9675 100644
--- a/debian/patches/02_FHS.patch
+++ b/debian/patches/02_FHS.patch
@@ -22,7 +22,7 @@ index 1d898a7..d57a3b4 100644
DENY_DELIMITER = "# DenyHosts:"
ENTRY_DELIMITER = " | "
diff --git a/daemon-control-dist b/daemon-control-dist
-index dd49315..9f42b60 100755
+index dd49315..7df8e7a 100755
--- a/daemon-control-dist
+++ b/daemon-control-dist
@@ -11,9 +11,9 @@
@@ -33,7 +33,7 @@ index dd49315..9f42b60 100755
-DENYHOSTS_LOCK = "/var/lock/subsys/denyhosts"
-DENYHOSTS_CFG = "/usr/share/denyhosts/denyhosts.cfg"
+DENYHOSTS_BIN = "/usr/sbin/denyhosts"
-+DENYHOSTS_LOCK = "/var/run/denyhosts.pid"
++DENYHOSTS_LOCK = "/run/denyhosts.pid"
+DENYHOSTS_CFG = "/etc/denyhosts.conf"
PYTHON_BIN = "/usr/bin/env python"
diff --git a/debian/patches/03_default-config.patch b/debian/patches/03_default-config.patch
index 1b61fe9..33c8996 100644
--- a/debian/patches/03_default-config.patch
+++ b/debian/patches/03_default-config.patch
@@ -8,7 +8,7 @@ New patch generated from denyhosts 2.4b-1 diff.gz
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/denyhosts.cfg-dist b/denyhosts.cfg-dist
-index 6551b3f..a186f33 100644
+index 6551b3f..c045bbd 100644
--- a/denyhosts.cfg-dist
+++ b/denyhosts.cfg-dist
@@ -9,7 +9,7 @@
@@ -47,7 +47,7 @@ index 6551b3f..a186f33 100644
#
# Debian
-#LOCK_FILE = /var/run/denyhosts.pid
-+LOCK_FILE = /var/run/denyhosts.pid
++LOCK_FILE = /run/denyhosts.pid
#
# Misc
#LOCK_FILE = /tmp/denyhosts.lock