From ef29d7bd2929d6b493337a9f4e22b3613ff07007 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Wed, 12 Mar 2014 20:32:41 +1100 Subject: [PATCH] ENH: paths-{common,distro} normalisation --- MANIFEST | 4 ++++ config/jail.conf | 4 ++-- config/{common-paths.conf => paths-common.conf} | 0 config/{debian-paths.conf => paths-debian.conf} | 2 +- config/{fedora-paths.conf => paths-fedora.conf} | 2 +- config/{freebsd-paths.conf => paths-freebsd.conf} | 0 config/{osx-paths.conf => paths-osx.conf} | 0 7 files changed, 8 insertions(+), 4 deletions(-) rename config/{common-paths.conf => paths-common.conf} (100%) rename config/{debian-paths.conf => paths-debian.conf} (95%) rename config/{fedora-paths.conf => paths-fedora.conf} (95%) rename config/{freebsd-paths.conf => paths-freebsd.conf} (100%) rename config/{osx-paths.conf => paths-osx.conf} (100%) diff --git a/MANIFEST b/MANIFEST index e4643583..9987adaf 100644 --- a/MANIFEST +++ b/MANIFEST @@ -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 similarity index 100% rename from config/common-paths.conf rename to config/paths-common.conf diff --git a/config/debian-paths.conf b/config/paths-debian.conf similarity index 95% rename from config/debian-paths.conf rename to 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 similarity index 95% rename from config/fedora-paths.conf rename to 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 similarity index 100% rename from config/freebsd-paths.conf rename to config/paths-freebsd.conf diff --git a/config/osx-paths.conf b/config/paths-osx.conf similarity index 100% rename from config/osx-paths.conf rename to config/paths-osx.conf