ENH: paths-{common,distro} normalisation

2014-03-12 20:32:41 +11:00 · 2014-03-12 20:32:41 +11:00 · ef29d7bd29
parent 79dab54619
commit ef29d7bd29
7 changed files with 8 additions and 4 deletions
--- a/4
+++ b/4
@ -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
--- 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.
--- a/config/paths-common.conf
+++ b/config/paths-common.conf
--- a/config/paths-debian.conf
+++ b/config/paths-debian.conf
@ -2,7 +2,7 @@

 [INCLUDES]

-before = common-paths.conf
+before = paths-common.conf

 after  = paths-overrides.local

--- a/config/paths-fedora.conf
+++ b/config/paths-fedora.conf
@ -2,7 +2,7 @@

 [INCLUDES]

-before = common-paths.conf
+before = paths-common.conf

 after  = paths-overrides.local

--- a/config/paths-freebsd.conf
+++ b/config/paths-freebsd.conf
--- a/config/paths-osx.conf
+++ b/config/paths-osx.conf