From a2b29b4875455662b48b2f9f3537bc17445a887d Mon Sep 17 00:00:00 2001 From: Pascal Borreli Date: Sun, 10 Mar 2013 22:05:33 +0000 Subject: [PATCH] Fixed typos --- DEVELOP | 6 +++--- config/action.d/dshield.conf | 2 +- config/action.d/iptables-allports.conf | 2 +- config/action.d/iptables-ipset-proto4.conf | 2 +- config/action.d/iptables-ipset-proto6.conf | 2 +- config/action.d/iptables-multiport-log.conf | 2 +- config/action.d/iptables-multiport.conf | 2 +- config/action.d/iptables-new.conf | 2 +- config/action.d/iptables-xt_recent-echo.conf | 4 ++-- config/action.d/iptables.conf | 2 +- config/action.d/mail-whois-lines.conf | 2 +- config/action.d/mail-whois.conf | 2 +- config/action.d/mail.conf | 2 +- config/action.d/sendmail-buffered.conf | 2 +- config/action.d/sendmail-whois-lines.conf | 2 +- config/action.d/sendmail-whois.conf | 2 +- config/action.d/sendmail.conf | 2 +- config/filter.d/apache-badbots.conf | 2 +- config/jail.conf | 2 +- doc/run-rootless.txt | 14 +++++++------- fail2ban-client | 2 +- server/action.py | 4 ++-- server/filter.py | 8 ++++---- server/filterpoll.py | 2 +- 24 files changed, 37 insertions(+), 37 deletions(-) diff --git a/DEVELOP b/DEVELOP index 25369830..cddf4456 100644 --- a/DEVELOP +++ b/DEVELOP @@ -92,7 +92,7 @@ Documentation ------------- Ensure this documentation is up to date after changes. Also ensure that the man -pages still are accurage. Ensure that there is sufficient documentation for +pages still are accurate. Ensure that there is sufficient documentation for your new features to be used. Bugs @@ -107,7 +107,7 @@ Use the following tags in your commit messages: 'ENH:' for enhancements 'BF:' for bug fixes -'DOC:' for documenation fixes +'DOC:' for documentation fixes Adding Actions -------------- @@ -265,4 +265,4 @@ python -c 'import common.protocol; common.protocol.printWiki()' email users and development list of release -TODO notifing distributors etc. +TODO notifying distributors etc. diff --git a/config/action.d/dshield.conf b/config/action.d/dshield.conf index 177329b2..fea8f196 100644 --- a/config/action.d/dshield.conf +++ b/config/action.d/dshield.conf @@ -116,7 +116,7 @@ actionunban = if [ -f .first ]; then port = ??? # Option: userid -# Notes.: Your DSheild user ID. Should be provided either in the jail config or +# Notes.: Your DShield user ID. Should be provided either in the jail config or # in a .local file. # Register at https://secure.dshield.org/register.html # Values: [ NUM ] Default: 0 diff --git a/config/action.d/iptables-allports.conf b/config/action.d/iptables-allports.conf index f534fee9..c7f76c83 100644 --- a/config/action.d/iptables-allports.conf +++ b/config/action.d/iptables-allports.conf @@ -53,7 +53,7 @@ actionunban = iptables -D fail2ban- -s -j DROP [Init] -# Defaut name of the chain +# Default name of the chain # name = default diff --git a/config/action.d/iptables-ipset-proto4.conf b/config/action.d/iptables-ipset-proto4.conf index f7d03f67..665d35cf 100644 --- a/config/action.d/iptables-ipset-proto4.conf +++ b/config/action.d/iptables-ipset-proto4.conf @@ -53,7 +53,7 @@ actionunban = ipset --test fail2ban- && ipset --del fail2ban- < [Init] -# Defaut name of the ipset +# Default name of the ipset # name = default diff --git a/config/action.d/iptables-ipset-proto6.conf b/config/action.d/iptables-ipset-proto6.conf index 3352d63d..e4ceb0d0 100644 --- a/config/action.d/iptables-ipset-proto6.conf +++ b/config/action.d/iptables-ipset-proto6.conf @@ -53,7 +53,7 @@ actionunban = ipset del fail2ban- -exist [Init] -# Defaut name of the ipset +# Default name of the ipset # name = default diff --git a/config/action.d/iptables-multiport-log.conf b/config/action.d/iptables-multiport-log.conf index 9cdc4bab..0f4947dd 100644 --- a/config/action.d/iptables-multiport-log.conf +++ b/config/action.d/iptables-multiport-log.conf @@ -61,7 +61,7 @@ actionunban = iptables -D fail2ban- -s -j fail2ban--log [Init] -# Defaut name of the chain +# Default name of the chain # name = default diff --git a/config/action.d/iptables-multiport.conf b/config/action.d/iptables-multiport.conf index d062f74d..8b15ad86 100644 --- a/config/action.d/iptables-multiport.conf +++ b/config/action.d/iptables-multiport.conf @@ -51,7 +51,7 @@ actionunban = iptables -D fail2ban- -s -j DROP [Init] -# Defaut name of the chain +# Default name of the chain # name = default diff --git a/config/action.d/iptables-new.conf b/config/action.d/iptables-new.conf index 92bd9a55..64f54582 100644 --- a/config/action.d/iptables-new.conf +++ b/config/action.d/iptables-new.conf @@ -53,7 +53,7 @@ actionunban = iptables -D fail2ban- -s -j DROP [Init] -# Defaut name of the chain +# Default name of the chain # name = default diff --git a/config/action.d/iptables-xt_recent-echo.conf b/config/action.d/iptables-xt_recent-echo.conf index f3ac80b5..170fef07 100644 --- a/config/action.d/iptables-xt_recent-echo.conf +++ b/config/action.d/iptables-xt_recent-echo.conf @@ -11,7 +11,7 @@ # Notes.: command executed once at the start of Fail2Ban. # Values: CMD # -# Changing iptables rules requires root priviledges. If fail2ban is +# Changing iptables rules requires root privileges. If fail2ban is # configured to run as root, firewall setup can be performed by # fail2ban automatically. However, if fail2ban is configured to run as # a normal user, the configuration must be done by some other means @@ -65,7 +65,7 @@ actionunban = echo - > /proc/net/xt_recent/fail2ban- [Init] -# Defaut name of the chain +# Default name of the chain # name = default diff --git a/config/action.d/iptables.conf b/config/action.d/iptables.conf index a846f971..083065fc 100644 --- a/config/action.d/iptables.conf +++ b/config/action.d/iptables.conf @@ -51,7 +51,7 @@ actionunban = iptables -D fail2ban- -s -j DROP [Init] -# Defaut name of the chain +# Default name of the chain # name = default diff --git a/config/action.d/mail-whois-lines.conf b/config/action.d/mail-whois-lines.conf index 6d3343b6..1ace68f6 100644 --- a/config/action.d/mail-whois-lines.conf +++ b/config/action.d/mail-whois-lines.conf @@ -62,7 +62,7 @@ actionunban = [Init] -# Defaut name of the chain +# Default name of the chain # name = default diff --git a/config/action.d/mail-whois.conf b/config/action.d/mail-whois.conf index 9e6ec88e..1581c42c 100644 --- a/config/action.d/mail-whois.conf +++ b/config/action.d/mail-whois.conf @@ -59,7 +59,7 @@ actionunban = [Init] -# Defaut name of the chain +# Default name of the chain # name = default diff --git a/config/action.d/mail.conf b/config/action.d/mail.conf index 01f22ff8..02946b43 100644 --- a/config/action.d/mail.conf +++ b/config/action.d/mail.conf @@ -57,7 +57,7 @@ actionunban = [Init] -# Defaut name of the chain +# Default name of the chain # name = default diff --git a/config/action.d/sendmail-buffered.conf b/config/action.d/sendmail-buffered.conf index 25a23b78..80f71374 100644 --- a/config/action.d/sendmail-buffered.conf +++ b/config/action.d/sendmail-buffered.conf @@ -83,7 +83,7 @@ actionunban = [Init] -# Defaut name of the chain +# Default name of the chain # name = default diff --git a/config/action.d/sendmail-whois-lines.conf b/config/action.d/sendmail-whois-lines.conf index b84440d0..dfbf9ff8 100644 --- a/config/action.d/sendmail-whois-lines.conf +++ b/config/action.d/sendmail-whois-lines.conf @@ -73,7 +73,7 @@ actionunban = [Init] -# Defaut name of the chain +# Default name of the chain # name = default diff --git a/config/action.d/sendmail-whois.conf b/config/action.d/sendmail-whois.conf index 363c3398..e6a15fb5 100644 --- a/config/action.d/sendmail-whois.conf +++ b/config/action.d/sendmail-whois.conf @@ -71,7 +71,7 @@ actionunban = [Init] -# Defaut name of the chain +# Default name of the chain # name = default diff --git a/config/action.d/sendmail.conf b/config/action.d/sendmail.conf index bdc2a3b6..5bb75575 100644 --- a/config/action.d/sendmail.conf +++ b/config/action.d/sendmail.conf @@ -69,7 +69,7 @@ actionunban = [Init] -# Defaut name of the chain +# Default name of the chain # name = default diff --git a/config/filter.d/apache-badbots.conf b/config/filter.d/apache-badbots.conf index 1d70bb0e..1c60676d 100644 --- a/config/filter.d/apache-badbots.conf +++ b/config/filter.d/apache-badbots.conf @@ -16,7 +16,7 @@ badbots = atSpider/1\.0|autoemailspider|China Local Browse 2\.6|ContentSmartz|Da # Option: failregex # Notes.: Regexp to catch known spambots and software alike. Please verify # that it is your intent to block IPs which were driven by -# abovementioned bots. +# above mentioned bots. # Values: TEXT # failregex = ^ -.*"(GET|POST).*HTTP.*"(?:%(badbots)s|%(badbotscustom)s)"$ diff --git a/config/jail.conf b/config/jail.conf index a0093f68..8bb1a6b6 100644 --- a/config/jail.conf +++ b/config/jail.conf @@ -241,7 +241,7 @@ logpath = /var/log/lighttpd/error.log maxretry = 2 # Same as above for mod_auth -# It catches wrong authentifications +# It catches wrong authentications [lighttpd-auth] diff --git a/doc/run-rootless.txt b/doc/run-rootless.txt index 85a8f766..5edf6ef6 100644 --- a/doc/run-rootless.txt +++ b/doc/run-rootless.txt @@ -1,7 +1,7 @@ -Fail2ban normally requires root priviledges to insert iptables rules +Fail2ban normally requires root privileges to insert iptables rules through calls to /sbin/iptables and also to read the logfiles. -Fail2ban can run as an unpriviledged user provided that those two -capabilites are preserved. The idea is to run fail2ban as a normal +Fail2ban can run as an unprivileged user provided that those two +capabilities are preserved. The idea is to run fail2ban as a normal user (e.g. fail2ban) who belongs to a group which is allowed to read logfiles. The user should also be allowed to write to /proc/net/xt_recent/fail2ban- (name is specified in the iptables @@ -20,14 +20,14 @@ Another way to use xt_recent is by inserting the rules by writing to action. Files in /proc/net/xt_recent/ are protected by normal filesystem rules, so can be chown'ed and chmod'ed to be writable by a certain user. After the necessary iptables rules are inserted (which -requires root priviledges), blacklisting can be perfomed by an -unpriviledged user. +requires root privileges), blacklisting can be performed by an +unprivileged user. Using fail2ban with xt_recent allows smarter filtering than normal iptables rules with the xt_recent module can provide. The disadvantage is that fail2ban cannot perform the setup by itself, -which would require the priviledge to call /sbin/iptables, and it must +which would require the privilege to call /sbin/iptables, and it must be done through other means. The primary advantage is obvious: it's generally better to run @@ -46,7 +46,7 @@ some user and thus allow delisting IPs by helper administrators without the ability to mess up other iptables rules. The xt_recent-echo jail can be used under the root user without -further configuration. To run not as root, futher setup is necessary: +further configuration. To run not as root, further setup is necessary: - Create user: diff --git a/fail2ban-client b/fail2ban-client index ed211e62..b832450e 100755 --- a/fail2ban-client +++ b/fail2ban-client @@ -297,7 +297,7 @@ class Fail2banClient: delta = -1 elif pos < 2: delta = 1 - # The server has 30 secondes to start. + # The server has 30 seconds to start. if cnt >= 300: if self.__conf["verbose"] > 1: sys.stdout.write('\n') diff --git a/server/action.py b/server/action.py index 35974c70..5fde3ae1 100644 --- a/server/action.py +++ b/server/action.py @@ -277,8 +277,8 @@ class Action: # Executes a command with preliminary checks and substitutions. # # Before executing any commands, executes the "check" command first - # in order to check if prerequirements are met. If this check fails, - # it tries to restore a sane environnement before executing the real + # in order to check if pre-requirements are met. If this check fails, + # it tries to restore a sane environment before executing the real # command. # Replaces "aInfo" and "cInfo" in the query too. # diff --git a/server/filter.py b/server/filter.py index fb292573..64a6c5e5 100644 --- a/server/filter.py +++ b/server/filter.py @@ -44,7 +44,7 @@ logSys = logging.getLogger("fail2ban.filter") # Log reader class. # # This class reads a log file and detects login failures or anything else -# that matches a given regular expression. This class is instanciated by +# that matches a given regular expression. This class is instantiated by # a Jail object. class Filter(JailThread): @@ -117,7 +117,7 @@ class Filter(JailThread): # Add the regular expression which matches the failure. # # The regular expression can also match any other pattern than failures - # and thus can be used for many purporse. + # and thus can be used for many purpose. # @param value the regular expression def addIgnoreRegex(self, value): @@ -414,7 +414,7 @@ class FileFilter(Filter): def _addLogPath(self, path): # nothing to do by default - # to be overriden by backends + # to be overridden by backends pass @@ -433,7 +433,7 @@ class FileFilter(Filter): def _delLogPath(self, path): # nothing to do by default - # to be overriden by backends + # to be overridden by backends pass ## diff --git a/server/filterpoll.py b/server/filterpoll.py index 0719545a..f0e23ac1 100644 --- a/server/filterpoll.py +++ b/server/filterpoll.py @@ -39,7 +39,7 @@ logSys = logging.getLogger("fail2ban.filter") # Log reader class. # # This class reads a log file and detects login failures or anything else -# that matches a given regular expression. This class is instanciated by +# that matches a given regular expression. This class is instantiated by # a Jail object. class FilterPoll(FileFilter):