Sophie

Sophie

sources > fail2ban > fail2ban-0.8.4-notmp.patch > e716bf2f746f0b782d072cba4054269b
Prev Next
diff -rud fail2ban-0.8.4.org/ChangeLog fail2ban-0.8.4/ChangeLog
--- fail2ban-0.8.4.org/ChangeLog	2009-09-07 21:11:29.000000000 +0200
+++ fail2ban-0.8.4/ChangeLog	2011-04-09 17:56:51.029085738 +0200
@@ -353,7 +353,7 @@
   Thanks to Tom Pike
 - fail2ban.conf modified for readability. Thanks to Iain Lea
 - Added an initd script for Gentoo
-- Changed default PID lock file location from /tmp to /var/run
+- Changed default PID lock file location from /var/lib/fail2ban to /var/run
 
 ver. 0.4.0 (2005/04/24) - stable
 ----------
diff -rud fail2ban-0.8.4.org/client/fail2banreader.py fail2ban-0.8.4/client/fail2banreader.py
--- fail2ban-0.8.4.org/client/fail2banreader.py	2008-02-27 22:44:56.000000000 +0100
+++ fail2ban-0.8.4/client/fail2banreader.py	2011-04-09 17:56:51.027086612 +0200
@@ -39,7 +39,7 @@
 		ConfigReader.read(self, "fail2ban")
 	
 	def getEarlyOptions(self):
-		opts = [["string", "socket", "/tmp/fail2ban.sock"]]
+		opts = [["string", "socket", "/var/lib/fail2ban/fail2ban.sock"]]
 		return ConfigReader.getOptions(self, "Definition", opts)
 	
 	def getOptions(self):
diff -rud fail2ban-0.8.4.org/config/action.d/dshield.conf fail2ban-0.8.4/config/action.d/dshield.conf
--- fail2ban-0.8.4.org/config/action.d/dshield.conf	2008-07-14 19:13:47.000000000 +0200
+++ fail2ban-0.8.4/config/action.d/dshield.conf	2011-04-09 17:56:51.031085423 +0200
@@ -204,7 +204,7 @@
 
 # Option:  tmpfile
 # Notes.:  Base name of temporary files used for buffering
-# Values:  [ STRING ]  Default: /tmp/fail2ban-dshield
+# Values:  [ STRING ]  Default: /var/lib/fail2ban/fail2ban-dshield
 #
-tmpfile = /tmp/fail2ban-dshield
+tmpfile = /var/lib/fail2ban/fail2ban-dshield
 
diff -rud fail2ban-0.8.4.org/config/action.d/mail-buffered.conf fail2ban-0.8.4/config/action.d/mail-buffered.conf
--- fail2ban-0.8.4.org/config/action.d/mail-buffered.conf	2008-07-16 23:11:43.000000000 +0200
+++ fail2ban-0.8.4/config/action.d/mail-buffered.conf	2011-04-09 17:56:51.031085423 +0200
@@ -81,7 +81,7 @@
 
 # Default temporary file
 #
-tmpfile = /tmp/fail2ban-mail.txt
+tmpfile = /var/lib/fail2ban/fail2ban-mail.txt
 
 # Destination/Addressee of the mail
 #
diff -rud fail2ban-0.8.4.org/config/action.d/mynetwatchman.conf fail2ban-0.8.4/config/action.d/mynetwatchman.conf
--- fail2ban-0.8.4.org/config/action.d/mynetwatchman.conf	2008-07-14 19:14:13.000000000 +0200
+++ fail2ban-0.8.4/config/action.d/mynetwatchman.conf	2011-04-09 17:56:51.030086280 +0200
@@ -139,6 +139,6 @@
 
 # Option:  tmpfile
 # Notes.:  Base name of temporary files
-# Values:  [ STRING ]  Default: /tmp/fail2ban-mynetwatchman
+# Values:  [ STRING ]  Default: /var/lib/fail2ban/fail2ban-mynetwatchman
 #
-tmpfile = /tmp/fail2ban-mynetwatchman
+tmpfile = /var/lib/fail2ban/fail2ban-mynetwatchman
diff -rud fail2ban-0.8.4.org/config/action.d/sendmail-buffered.conf fail2ban-0.8.4/config/action.d/sendmail-buffered.conf
--- fail2ban-0.8.4.org/config/action.d/sendmail-buffered.conf	2008-07-16 23:11:43.000000000 +0200
+++ fail2ban-0.8.4/config/action.d/sendmail-buffered.conf	2011-04-09 17:56:51.029085738 +0200
@@ -101,5 +101,5 @@
 
 # Default temporary file
 #
-tmpfile = /tmp/fail2ban-mail.txt
+tmpfile = /var/lib/fail2ban/fail2ban-mail.txt
 
diff -rud fail2ban-0.8.4.org/files/nagios/f2ban.txt fail2ban-0.8.4/files/nagios/f2ban.txt
--- fail2ban-0.8.4.org/files/nagios/f2ban.txt	2009-01-27 23:53:40.000000000 +0100
+++ fail2ban-0.8.4/files/nagios/f2ban.txt	2011-04-09 17:56:51.027086612 +0200
@@ -6,7 +6,7 @@
 /etc/init.d/fail2ban stop
 
 2.) delete the socket if avalible
-rm /tmp/fail2ban.sock
+rm /var/lib/fail2ban/fail2ban.sock
 
 3.) start the Service 
 /etc/init.d/fail2ban start
diff -rud fail2ban-0.8.4.org/testcases/actiontestcase.py fail2ban-0.8.4/testcases/actiontestcase.py
--- fail2ban-0.8.4.org/testcases/actiontestcase.py	2008-02-27 22:44:54.000000000 +0100
+++ fail2ban-0.8.4/testcases/actiontestcase.py	2011-04-09 17:56:51.027086612 +0200
@@ -38,10 +38,10 @@
 		self.__action.execActionStop()
 	
 	def testExecuteActionBan(self):
-		self.__action.setActionStart("touch /tmp/fail2ban.test")
-		self.__action.setActionStop("rm -f /tmp/fail2ban.test")
+		self.__action.setActionStart("touch /var/lib/fail2ban/fail2ban.test")
+		self.__action.setActionStop("rm -f /var/lib/fail2ban/fail2ban.test")
 		self.__action.setActionBan("echo -n")
-		self.__action.setActionCheck("[ -e /tmp/fail2ban.test ]")
+		self.__action.setActionCheck("[ -e /var/lib/fail2ban/fail2ban.test ]")
 		
 		self.assertTrue(self.__action.execActionBan(None))
 		
\ No newline at end of file