diff options
| author | Daniel Black <grooverdan@users.sourceforge.net> | 2014-03-12 20:32:41 +1100 |
|---|---|---|
| committer | Daniel Black <grooverdan@users.sourceforge.net> | 2014-03-12 20:32:41 +1100 |
| commit | ef29d7bd2929d6b493337a9f4e22b3613ff07007 (patch) | |
| tree | bbd3cb77c2df521c40b076f22056c2126539f792 | |
| parent | 79dab54619d93b8d9c308e1a635ada9ed29bf390 (diff) | |
| download | fail2ban-ef29d7bd2929d6b493337a9f4e22b3613ff07007.tar.gz | |
ENH: paths-{common,distro} normalisation
| -rw-r--r-- | MANIFEST | 4 | ||||
| -rw-r--r-- | config/jail.conf | 4 | ||||
| -rw-r--r-- | config/paths-common.conf (renamed from config/common-paths.conf) | 0 | ||||
| -rw-r--r-- | config/paths-debian.conf (renamed from config/debian-paths.conf) | 2 | ||||
| -rw-r--r-- | config/paths-fedora.conf (renamed from config/fedora-paths.conf) | 2 | ||||
| -rw-r--r-- | config/paths-freebsd.conf (renamed from config/freebsd-paths.conf) | 0 | ||||
| -rw-r--r-- | config/paths-osx.conf (renamed from config/osx-paths.conf) | 0 |
7 files changed, 8 insertions, 4 deletions
@@ -66,6 +66,10 @@ fail2ban/tests/misctestcase.py fail2ban/tests/databasetestcase.py fail2ban/tests/config/jail.conf fail2ban/tests/config/fail2ban.conf +fail2ban/tests/config/paths-common.conf +fail2ban/tests/config/paths-freebsd.conf +fail2ban/tests/config/paths-osx.conf +fail2ban/tests/config/paths-debian.conf fail2ban/tests/config/filter.d/simple.conf fail2ban/tests/config/action.d/brokenaction.conf fail2ban/tests/files/config/apache-auth/digest/.htaccess diff --git a/config/jail.conf b/config/jail.conf index c1c68b8b..e7974336 100644 --- a/config/jail.conf +++ b/config/jail.conf @@ -33,8 +33,8 @@ [INCLUDES] -#before = disto-paths.conf -before = debian-paths.conf +#before = paths-disto.conf +before = paths-debian.conf # The DEFAULT allows a global definition of the options. They can be overridden # in each jail afterwards. diff --git a/config/common-paths.conf b/config/paths-common.conf index 64eec744..64eec744 100644 --- a/config/common-paths.conf +++ b/config/paths-common.conf diff --git a/config/debian-paths.conf b/config/paths-debian.conf index e2236823..50ff948b 100644 --- a/config/debian-paths.conf +++ b/config/paths-debian.conf @@ -2,7 +2,7 @@ [INCLUDES] -before = common-paths.conf +before = paths-common.conf after = paths-overrides.local diff --git a/config/fedora-paths.conf b/config/paths-fedora.conf index 5a6032d5..69322e43 100644 --- a/config/fedora-paths.conf +++ b/config/paths-fedora.conf @@ -2,7 +2,7 @@ [INCLUDES] -before = common-paths.conf +before = paths-common.conf after = paths-overrides.local diff --git a/config/freebsd-paths.conf b/config/paths-freebsd.conf index ee636a04..ee636a04 100644 --- a/config/freebsd-paths.conf +++ b/config/paths-freebsd.conf diff --git a/config/osx-paths.conf b/config/paths-osx.conf index cbe17151..cbe17151 100644 --- a/config/osx-paths.conf +++ b/config/paths-osx.conf |