[Fail2ban-commit] SF.net SVN: fail2ban: [511] trunk

[<los...@us...>]

Revision: 511
          http://svn.sourceforge.net/fail2ban/?rev=511&view=rev
Author:   lostcontrol
Date:     2007-01-04 04:58:21 -0800 (Thu, 04 Jan 2007)

Log Message:
-----------
- Now Fail2ban goes in /usr/share/fail2ban instead of /usr/lib/fail2ban. This is more compliant with FHS. Thanks to Axel Thimm and Yaroslav Halchenko

Modified Paths:
--------------
    trunk/CHANGELOG
    trunk/fail2ban-client
    trunk/fail2ban-regex
    trunk/fail2ban-server
    trunk/fail2ban-testcases
    trunk/setup.cfg
    trunk/setup.py

Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	2007-01-04 12:21:44 UTC (rev 510)
+++ trunk/CHANGELOG	2007-01-04 12:58:21 UTC (rev 511)
@@ -4,10 +4,10 @@
              |_| \__,_|_|_/___|_.__/\__,_|_||_|
 
 =============================================================
-Fail2Ban (version 0.7.6)                           200?/??/??
+Fail2Ban (version 0.7.6)                           2007/01/04
 =============================================================
 
-ver. 0.7.6 (200?/??/??) - ???
+ver. 0.7.6 (2007/01/04) - beta
 ----------
 - Added a "sleep 1" in redhat-initd. Thanks to Jim Wight
 - Use /dev/log for SYSLOG output. Thanks to Joerg Sommrey
@@ -20,6 +20,9 @@
 - Added license in COPYING. Thanks to Axel Thimm
 - Allow comma in action options. The value of the option must
   be escaped with " or '. Thanks to Yaroslav Halchenko
+- Now Fail2ban goes in /usr/share/fail2ban instead of
+  /usr/lib/fail2ban. This is more compliant with FHS. Thanks
+  to Axel Thimm and Yaroslav Halchenko
 
 ver. 0.7.5 (2006/12/07) - beta
 ----------

Modified: trunk/fail2ban-client
===================================================================
--- trunk/fail2ban-client	2007-01-04 12:21:44 UTC (rev 510)
+++ trunk/fail2ban-client	2007-01-04 12:58:21 UTC (rev 511)
@@ -30,7 +30,7 @@
 
 # Inserts our own modules path first in the list
 # fix for bug #343821
-sys.path.insert(1, "/usr/lib/fail2ban")
+sys.path.insert(1, "/usr/share/fail2ban")
 
 # Now we can import our modules
 from common.version import version

Modified: trunk/fail2ban-regex
===================================================================
--- trunk/fail2ban-regex	2007-01-04 12:21:44 UTC (rev 510)
+++ trunk/fail2ban-regex	2007-01-04 12:58:21 UTC (rev 511)
@@ -29,7 +29,7 @@
 
 # Inserts our own modules path first in the list
 # fix for bug #343821
-sys.path.insert(1, "/usr/lib/fail2ban")
+sys.path.insert(1, "/usr/share/fail2ban")
 
 from common.version import version
 from server.filter import Filter

Modified: trunk/fail2ban-server
===================================================================
--- trunk/fail2ban-server	2007-01-04 12:21:44 UTC (rev 510)
+++ trunk/fail2ban-server	2007-01-04 12:58:21 UTC (rev 511)
@@ -29,7 +29,7 @@
 
 # Inserts our own modules path first in the list
 # fix for bug #343821
-sys.path.insert(1, "/usr/lib/fail2ban")
+sys.path.insert(1, "/usr/share/fail2ban")
 
 from common.version import version
 from server.server import Server

Modified: trunk/fail2ban-testcases
===================================================================
--- trunk/fail2ban-testcases	2007-01-04 12:21:44 UTC (rev 510)
+++ trunk/fail2ban-testcases	2007-01-04 12:58:21 UTC (rev 511)
@@ -30,7 +30,7 @@
 
 # Inserts our own modules path first in the list
 # fix for bug #343821
-sys.path.insert(1, "/usr/lib/fail2ban")
+sys.path.insert(1, "/usr/share/fail2ban")
 
 from common.version import version
 from testcases import banmanagertestcase

Modified: trunk/setup.cfg
===================================================================
--- trunk/setup.cfg	2007-01-04 12:21:44 UTC (rev 510)
+++ trunk/setup.cfg	2007-01-04 12:58:21 UTC (rev 511)
@@ -1,5 +1,5 @@
 [install]
-install-purelib=/usr/lib/fail2ban
+install-purelib=/usr/share/fail2ban
 
 [sdist]
 formats=bztar

Modified: trunk/setup.py
===================================================================
--- trunk/setup.py	2007-01-04 12:21:44 UTC (rev 510)
+++ trunk/setup.py	2007-01-04 12:58:21 UTC (rev 511)
@@ -28,7 +28,7 @@
 
 from distutils.core import setup
 from common.version import version
-from os.path import isfile, join
+from os.path import isfile, join, isdir
 from sys import argv
 from glob import glob
 
@@ -113,6 +113,13 @@
 		print "\t" + f
 	print
 
+if isdir("/usr/lib/fail2ban"):
+	print
+	print "Fail2ban is not installed under /usr/lib anymore. The new " \
+		  "location is under /usr/share. Please remove the directory " \
+		  "/usr/lib/fail2ban and everything under this directory."
+	print
+
 # Update config file
 if argv[1] == "install":
 	print


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.