From 62602a9ed002b9a7f53fe5f458293ac60a67ef7d Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Tue, 23 Apr 2013 13:58:58 -0400
Subject: [PATCH] Revert "ENH: by default enable a single jail -- sshd"

This reverts commit 47a62b60729e13b6811694dc52a07cb6a71cb539.

Enabling any jail by default should be a prerogative of particular
distributions (thanks Fabian Wenk for the discussion)

Conflicts:
	config/jail.conf
---
 config/jail.conf                       | 6 ++----
 fail2ban/tests/clientreadertestcase.py | 9 ++-------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/config/jail.conf b/config/jail.conf
index 55d8202e..c6eea0ef 100644
--- a/config/jail.conf
+++ b/config/jail.conf
@@ -72,9 +72,8 @@ usedns = warn
 logencoding = auto
 
 # "enabled" enables the jails.
-#  By default all (but sshd) jails are disabled.
-#   It is unlikely that the default value should ever be changed.
-#   Enable only relevant to your setup jails in your .local or jail.d/*.conf
+#  By default all jails are disabled, and it should stay this way.
+#  Enable only relevant to your setup jails in your .local or jail.d/*.conf
 #
 # true:  jail will be enabled and log files will get monitored for changes
 # false: jail is not enabled
@@ -149,7 +148,6 @@ action = %(action_)s
 
 [sshd]
 
-enabled = true
 port    = ssh
 logpath = /var/log/auth.log
           /var/log/sshd.log
diff --git a/fail2ban/tests/clientreadertestcase.py b/fail2ban/tests/clientreadertestcase.py
index d5fee47d..62d994c8 100644
--- a/fail2ban/tests/clientreadertestcase.py
+++ b/fail2ban/tests/clientreadertestcase.py
@@ -141,7 +141,7 @@ class JailReaderTest(unittest.TestCase):
 		jail = JailReader('sshd', basedir=CONFIG_DIR) # we are running tests from root project dir atm
 		self.assertTrue(jail.read())
 		self.assertTrue(jail.getOptions())
-		self.assertTrue(jail.isEnabled())
+		self.assertFalse(jail.isEnabled())
 		self.assertEqual(jail.getName(), 'sshd')
 
 	def testSplitOption(self):
@@ -207,12 +207,7 @@ class JailsReaderTest(unittest.TestCase):
 		comm_commands = jails.convert()
 		# by default None of the jails is enabled and we get no
 		# commands to communicate to the server
-		#self.assertEqual(comm_commands, [])
-		# by default now we have sshd jail enabled (only)
-		# so the list of commands should start with
-		self.assertEqual(comm_commands[0], ['add', 'sshd', 'auto'])
-		# and end with
-		self.assertEqual(comm_commands[-1], ['start', 'sshd'])
+		self.assertEqual(comm_commands, [])
 
 		allFilters = set()