]> Frank Brehm's Git Trees - salt/states.git/commitdiff
Adding states for Fail2ban
authorFrank Brehm <frank@brehm-online.com>
Mon, 29 Feb 2016 17:09:54 +0000 (18:09 +0100)
committerFrank Brehm <frank@brehm-online.com>
Mon, 29 Feb 2016 17:09:54 +0000 (18:09 +0100)
fail2ban/files/jail.conf [new file with mode: 0644]
fail2ban/files/postfix-jail.conf [new file with mode: 0644]
fail2ban/files/sendmail-common.conf [new file with mode: 0644]
fail2ban/files/sendmail-whois.conf [new file with mode: 0644]
fail2ban/files/sendmail.conf [new file with mode: 0644]
fail2ban/files/ssh-jail.conf [new file with mode: 0644]
fail2ban/init.sls [new file with mode: 0644]
top.sls

diff --git a/fail2ban/files/jail.conf b/fail2ban/files/jail.conf
new file mode 100644 (file)
index 0000000..145583b
--- /dev/null
@@ -0,0 +1,554 @@
+# Fail2Ban configuration file.
+#
+# This file was composed for Debian systems from the original one
+# provided now under /usr/share/doc/fail2ban/examples/jail.conf
+# for additional examples.
+#
+# Comments: use '#' for comment lines and ';' for inline comments
+#
+# To avoid merges during upgrades DO NOT MODIFY THIS FILE
+# and rather provide your changes in /etc/fail2ban/jail.local
+#
+
+# The DEFAULT allows a global definition of the options. They can be overridden
+# in each jail afterwards.
+
+[DEFAULT]
+
+# "ignoreip" can be an IP address, a CIDR mask or a DNS host. Fail2ban will not
+# ban a host which matches an address in this list. Several addresses can be
+# defined using space separator.
+ignoreip = 127.0.0.1/8
+
+# External command that will take an tagged arguments to ignore, e.g. <ip>,
+# and return true if the IP is to be ignored. False otherwise.
+#
+# ignorecommand = /path/to/command <ip>
+ignorecommand =
+
+# "bantime" is the number of seconds that a host is banned.
+bantime  = 600
+
+# A host is banned if it has generated "maxretry" during the last "findtime"
+# seconds.
+findtime = 600
+maxretry = 3
+
+# "backend" specifies the backend used to get files modification.
+# Available options are "pyinotify", "gamin", "polling" and "auto".
+# This option can be overridden in each jail as well.
+#
+# pyinotify: requires pyinotify (a file alteration monitor) to be installed.
+#            If pyinotify is not installed, Fail2ban will use auto.
+# gamin:     requires Gamin (a file alteration monitor) to be installed.
+#            If Gamin is not installed, Fail2ban will use auto.
+# polling:   uses a polling algorithm which does not require external libraries.
+# auto:      will try to use the following backends, in order:
+#            pyinotify, gamin, polling.
+backend = auto
+
+# "usedns" specifies if jails should trust hostnames in logs,
+#   warn when reverse DNS lookups are performed, or ignore all hostnames in logs
+#
+# yes:   if a hostname is encountered, a reverse DNS lookup will be performed.
+# warn:  if a hostname is encountered, a reverse DNS lookup will be performed,
+#        but it will be logged as a warning.
+# no:    if a hostname is encountered, will not be used for banning,
+#        but it will be logged as info.
+usedns = warn
+
+#
+# Destination email address used solely for the interpolations in
+# jail.{conf,local} configuration files.
+destemail = frank@brehm-online.com
+
+#
+# Name of the sender for mta actions
+sendername = Fail2Ban
+
+# Email address of the sender
+sender = fail2ban+{{ salt['grains.get']('host') }}@brehm-online.com
+
+#
+# ACTIONS
+#
+
+# Default banning action (e.g. iptables, iptables-new,
+# iptables-multiport, shorewall, etc) It is used to define
+# action_* variables. Can be overridden globally or per
+# section within jail.local file
+banaction = iptables-multiport
+
+# email action. Since 0.8.1 upstream fail2ban uses sendmail
+# MTA for the mailing. Change mta configuration parameter to mail
+# if you want to revert to conventional 'mail'.
+mta = sendmail
+
+# Default protocol
+protocol = tcp
+
+# Specify chain where jumps would need to be added in iptables-* actions
+chain = INPUT
+
+#
+# Action shortcuts. To be used to define action parameter
+
+# The simplest action to take: ban only
+action_ = %(banaction)s[name=%(__name__)s, port="%(port)s", protocol="%(protocol)s", chain="%(chain)s"]
+
+# ban & send an e-mail with whois report to the destemail.
+action_mw = %(banaction)s[name=%(__name__)s, port="%(port)s", protocol="%(protocol)s", chain="%(chain)s"]
+              %(mta)s-whois[name=%(__name__)s, dest="%(destemail)s", protocol="%(protocol)s", chain="%(chain)s", sender="%(sender)s", sendername="%(sendername)s"]
+
+# ban & send an e-mail with whois report and relevant log lines
+# to the destemail.
+action_mwl = %(banaction)s[name=%(__name__)s, port="%(port)s", protocol="%(protocol)s", chain="%(chain)s"]
+               %(mta)s-whois-lines[name=%(__name__)s, dest="%(destemail)s", logpath=%(logpath)s, chain="%(chain)s", sendername="%(sendername)s"]
+
+# Choose default action.  To change, just override value of 'action' with the
+# interpolation to the chosen action shortcut (e.g.  action_mw, action_mwl, etc) in jail.local
+# globally (section [DEFAULT]) or per specific section
+action = %(action_)s
+
+#
+# JAILS
+#
+
+# Next jails corresponds to the standard configuration in Fail2ban 0.6 which
+# was shipped in Debian. Enable any defined here jail by including
+#
+# [SECTION_NAME]
+# enabled = true
+
+#
+# in /etc/fail2ban/jail.local.
+#
+# Optionally you may override any other parameter (e.g. banaction,
+# action, port, logpath, etc) in that section within jail.local
+
+#[ssh]
+#
+#enabled  = true
+#port     = ssh
+#filter   = sshd
+#logpath  = /var/log/auth.log
+#maxretry = 6
+
+#[dropbear]
+#
+#enabled  = false
+#port     = ssh
+#filter   = dropbear
+#logpath  = /var/log/auth.log
+#maxretry = 6
+
+# Generic filter for pam. Has to be used with action which bans all ports
+# such as iptables-allports, shorewall
+#[pam-generic]
+#
+#enabled  = false
+## pam-generic filter can be customized to monitor specific subset of 'tty's
+#filter   = pam-generic
+## port actually must be irrelevant but lets leave it all for some possible uses
+#port     = all
+#banaction = iptables-allports
+#port     = anyport
+#logpath  = /var/log/auth.log
+#maxretry = 6
+
+#[xinetd-fail]
+#
+#enabled   = false
+#filter    = xinetd-fail
+#port      = all
+#banaction = iptables-multiport-log
+#logpath   = /var/log/daemon.log
+#maxretry  = 2
+
+
+#[ssh-ddos]
+#
+#enabled  = false
+#port     = ssh
+#filter   = sshd-ddos
+#logpath  = /var/log/auth.log
+#maxretry = 6
+
+
+# Here we use blackhole routes for not requiring any additional kernel support
+# to store large volumes of banned IPs
+
+#[ssh-route]
+#
+#enabled = false
+#filter = sshd
+#action = route
+#logpath = /var/log/sshd.log
+#maxretry = 6
+
+# Here we use a combination of Netfilter/Iptables and IPsets
+# for storing large volumes of banned IPs
+#
+# IPset comes in two versions. See ipset -V for which one to use
+# requires the ipset package and kernel support.
+#[ssh-iptables-ipset4]
+#
+#enabled  = false
+#port     = ssh
+#filter   = sshd
+#banaction = iptables-ipset-proto4
+#logpath  = /var/log/sshd.log
+#maxretry = 6
+
+#[ssh-iptables-ipset6]
+#
+#enabled  = false
+#port     = ssh
+#filter   = sshd
+#banaction = iptables-ipset-proto6
+#logpath  = /var/log/sshd.log
+#maxretry = 6
+
+
+#
+# HTTP servers
+#
+
+#[apache]
+#
+#enabled  = false
+#port     = http,https
+#filter   = apache-auth
+#logpath  = /var/log/apache*/*error.log
+#maxretry = 6
+
+# default action is now multiport, so apache-multiport jail was left
+# for compatibility with previous (<0.7.6-2) releases
+#[apache-multiport]
+#
+#enabled   = false
+#port      = http,https
+#filter    = apache-auth
+#logpath   = /var/log/apache*/*error.log
+#maxretry  = 6
+
+#[apache-noscript]
+#
+#enabled  = false
+#port     = http,https
+#filter   = apache-noscript
+#logpath  = /var/log/apache*/*error.log
+#maxretry = 6
+
+#[apache-overflows]
+#
+#enabled  = false
+#port     = http,https
+#filter   = apache-overflows
+#logpath  = /var/log/apache*/*error.log
+#maxretry = 2
+
+#[apache-modsecurity]
+#
+#enabled  = false
+#filter   = apache-modsecurity
+#port     = http,https
+#logpath  = /var/log/apache*/*error.log
+#maxretry = 2
+
+#[apache-nohome]
+#
+#enabled  = false
+#filter   = apache-nohome
+#port     = http,https
+#logpath  = /var/log/apache*/*error.log
+#maxretry = 2
+
+# Ban attackers that try to use PHP's URL-fopen() functionality
+# through GET/POST variables. - Experimental, with more than a year
+# of usage in production environments.
+
+#[php-url-fopen]
+#
+#enabled = false
+#port    = http,https
+#filter  = php-url-fopen
+#logpath = /var/www/*/logs/access_log
+
+# A simple PHP-fastcgi jail which works with lighttpd.
+# If you run a lighttpd server, then you probably will
+# find these kinds of messages in your error_log:
+#   ALERT – tried to register forbidden variable ‘GLOBALS’
+#   through GET variables (attacker '1.2.3.4', file '/var/www/default/htdocs/index.php')
+
+#[lighttpd-fastcgi]
+#
+#enabled = false
+#port    = http,https
+#filter  = lighttpd-fastcgi
+#logpath = /var/log/lighttpd/error.log
+
+# Same as above for mod_auth
+# It catches wrong authentifications
+
+#[lighttpd-auth]
+#
+#enabled = false
+#port    = http,https
+#filter  = suhosin
+#logpath = /var/log/lighttpd/error.log
+
+#[nginx-http-auth]
+#
+#enabled = false
+#filter  = nginx-http-auth
+#port    = http,https
+#logpath = /var/log/nginx/error.log
+
+# Monitor roundcube server
+
+#[roundcube-auth]
+#
+#enabled  = false
+#filter   = roundcube-auth
+#port     = http,https
+#logpath  = /var/log/roundcube/userlogins
+
+
+#[sogo-auth]
+#
+#enabled  = false
+#filter   = sogo-auth
+#port     = http, https
+## without proxy this would be:
+## port    = 20000
+#logpath  = /var/log/sogo/sogo.log
+
+
+#
+# FTP servers
+#
+
+#[vsftpd]
+#
+#enabled  = false
+#port     = ftp,ftp-data,ftps,ftps-data
+#filter   = vsftpd
+#logpath  = /var/log/vsftpd.log
+## or overwrite it in jails.local to be
+## logpath = /var/log/auth.log
+## if you want to rely on PAM failed login attempts
+## vsftpd's failregex should match both of those formats
+#maxretry = 6
+
+
+#[proftpd]
+#
+#enabled  = false
+#port     = ftp,ftp-data,ftps,ftps-data
+#filter   = proftpd
+#logpath  = /var/log/proftpd/proftpd.log
+#maxretry = 6
+
+
+#[pure-ftpd]
+#
+#enabled  = false
+#port     = ftp,ftp-data,ftps,ftps-data
+#filter   = pure-ftpd
+#logpath  = /var/log/syslog
+#maxretry = 6
+
+
+#[wuftpd]
+#
+#enabled  = false
+#port     = ftp,ftp-data,ftps,ftps-data
+#filter   = wuftpd
+#logpath  = /var/log/syslog
+#maxretry = 6
+
+
+#
+# Mail servers
+#
+
+#[postfix]
+#
+#enabled  = false
+#port     = smtp,ssmtp,submission
+#filter   = postfix
+#logpath  = /var/log/mail.log
+
+
+#[couriersmtp]
+#
+#enabled  = false
+#port     = smtp,ssmtp,submission
+#filter   = couriersmtp
+#logpath  = /var/log/mail.log
+
+
+#
+# Mail servers authenticators: might be used for smtp,ftp,imap servers, so
+# all relevant ports get banned
+#
+
+#[courierauth]
+#
+#enabled  = false
+#port     = smtp,ssmtp,submission,imap2,imap3,imaps,pop3,pop3s
+#filter   = courierlogin
+#logpath  = /var/log/mail.log
+
+
+#[sasl]
+#
+#enabled  = false
+#port     = smtp,ssmtp,submission,imap2,imap3,imaps,pop3,pop3s
+#filter   = postfix-sasl
+## You might consider monitoring /var/log/mail.warn instead if you are
+## running postfix since it would provide the same log lines at the
+## "warn" level but overall at the smaller filesize.
+#logpath  = /var/log/mail.log
+
+#[dovecot]
+#
+#enabled = false
+#port    = smtp,ssmtp,submission,imap2,imap3,imaps,pop3,pop3s
+#filter  = dovecot
+#logpath = /var/log/mail.log
+
+# To log wrong MySQL access attempts add to /etc/my.cnf:
+# log-error=/var/log/mysqld.log
+# log-warning = 2
+#[mysqld-auth]
+#
+#enabled  = false
+#filter   = mysqld-auth
+#port     = 3306
+#logpath  = /var/log/mysqld.log
+
+
+# DNS Servers
+
+
+# These jails block attacks against named (bind9). By default, logging is off
+# with bind9 installation. You will need something like this:
+#
+# logging {
+#     channel security_file {
+#         file "/var/log/named/security.log" versions 3 size 30m;
+#         severity dynamic;
+#         print-time yes;
+#     };
+#     category security {
+#         security_file;
+#     };
+# };
+#
+# in your named.conf to provide proper logging
+
+# !!! WARNING !!!
+#   Since UDP is connection-less protocol, spoofing of IP and imitation
+#   of illegal actions is way too simple.  Thus enabling of this filter
+#   might provide an easy way for implementing a DoS against a chosen
+#   victim. See
+#    http://nion.modprobe.de/blog/archives/690-fail2ban-+-dns-fail.html
+#   Please DO NOT USE this jail unless you know what you are doing.
+#[named-refused-udp]
+#
+#enabled  = false
+#port     = domain,953
+#protocol = udp
+#filter   = named-refused
+#logpath  = /var/log/named/security.log
+
+#[named-refused-tcp]
+#
+#enabled  = false
+#port     = domain,953
+#protocol = tcp
+#filter   = named-refused
+#logpath  = /var/log/named/security.log
+
+#[freeswitch]
+#
+#enabled  = false
+#filter   = freeswitch
+#logpath  = /var/log/freeswitch.log
+#maxretry = 10
+#action   = iptables-multiport[name=freeswitch-tcp, port="5060,5061,5080,5081", protocol=tcp]
+#           iptables-multiport[name=freeswitch-udp, port="5060,5061,5080,5081", protocol=udp]
+
+#[ejabberd-auth]
+#
+#enabled  = false
+#filter   = ejabberd-auth
+#port     = xmpp-client
+#protocol = tcp
+#logpath  = /var/log/ejabberd/ejabberd.log
+
+
+# Multiple jails, 1 per protocol, are necessary ATM:
+# see https://github.com/fail2ban/fail2ban/issues/37
+#[asterisk-tcp]
+#
+#enabled  = false
+#filter   = asterisk
+#port     = 5060,5061
+#protocol = tcp
+#logpath  = /var/log/asterisk/messages
+
+#[asterisk-udp]
+#
+#enabled  = false
+#filter         = asterisk
+#port     = 5060,5061
+#protocol = udp
+#logpath  = /var/log/asterisk/messages
+
+
+# Jail for more extended banning of persistent abusers
+# !!! WARNING !!!
+#   Make sure that your loglevel specified in fail2ban.conf/.local
+#   is not at DEBUG level -- which might then cause fail2ban to fall into
+#   an infinite loop constantly feeding itself with non-informative lines
+#[recidive]
+#
+#enabled  = false
+#filter   = recidive
+#logpath  = /var/log/fail2ban.log
+#action   = iptables-allports[name=recidive]
+#           sendmail-whois-lines[name=recidive, logpath=/var/log/fail2ban.log]
+#bantime  = 604800  ; 1 week
+#findtime = 86400   ; 1 day
+#maxretry = 5
+
+# See the IMPORTANT note in action.d/blocklist_de.conf for when to
+# use this action
+#
+# Report block via blocklist.de fail2ban reporting service API
+# See action.d/blocklist_de.conf for more information
+#[ssh-blocklist]
+#
+#enabled  = false
+#filter   = sshd
+#action   = iptables[name=SSH, port=ssh, protocol=tcp]
+#           sendmail-whois[name=SSH, dest="%(destemail)s", sender="%(sender)s", sendername="%(sendername)s"]
+#           blocklist_de[email="%(sender)s", apikey="xxxxxx", service="%(filter)s"]
+#logpath  = /var/log/sshd.log
+#maxretry = 20
+
+
+# consider low maxretry and a long bantime
+# nobody except your own Nagios server should ever probe nrpe
+#[nagios]
+#enabled  = false
+#filter   = nagios
+#action   = iptables[name=Nagios, port=5666, protocol=tcp]
+#           sendmail-whois[name=Nagios, dest="%(destemail)s", sender="%(sender)s", sendername="%(sendername)s"]
+#logpath  = /var/log/messages     ; nrpe.cfg may define a different log_facility
+#maxretry = 1
+
+# vim: filetype=dosini
diff --git a/fail2ban/files/postfix-jail.conf b/fail2ban/files/postfix-jail.conf
new file mode 100644 (file)
index 0000000..3b1751a
--- /dev/null
@@ -0,0 +1,11 @@
+
+[postfix]
+
+enabled  = true
+port     = smtp,ssmtp,submission
+filter   = postfix
+logpath  = /var/log/syslog.d/mail.log
+action   = %(action_mw)s
+
+
+# vim: filetype=dosini
diff --git a/fail2ban/files/sendmail-common.conf b/fail2ban/files/sendmail-common.conf
new file mode 100644 (file)
index 0000000..d4da4f2
--- /dev/null
@@ -0,0 +1,25 @@
+# Fail2Ban configuration file
+#
+# Common settings for sendmail actions
+#
+# Users can override the defaults in sendmail-common.local
+
+[INCLUDES]
+
+after = sendmail-common.local
+
+[Init]
+
+# Recipient mail address
+#
+dest = root
+
+# Sender mail address
+#
+sender = fail2ban
+
+# Sender display name
+#
+sendername = Fail2Ban
+
+# vim: filetype=dosini
diff --git a/fail2ban/files/sendmail-whois.conf b/fail2ban/files/sendmail-whois.conf
new file mode 100644 (file)
index 0000000..2528f7a
--- /dev/null
@@ -0,0 +1,78 @@
+# Fail2Ban configuration file
+#
+# Author: Cyril Jaquier
+#
+#
+
+[INCLUDES]
+
+before = sendmail-common.conf
+
+[Definition]
+
+# Option:  actionstart
+# Notes.:  command executed once at the start of Fail2Ban.
+# Values:  CMD
+#
+actionstart = printf %%b "Subject: [Fail2Ban] <name>: started on `uname -n`
+              Date: `LC_TIME=C date -u +"%%a, %%d %%h %%Y %%T +0000"`
+              From: <sendername> <<sender>>
+              To: <dest>\n
+              Hi,\n
+              The jail <name> has been started successfully.\n
+              Regards,\n
+              Fail2Ban" | /usr/sbin/sendmail -f <sender> <dest>
+
+# Option:  actionstop
+# Notes.:  command executed once at the end of Fail2Ban
+# Values:  CMD
+#
+actionstop = printf %%b "Subject: [Fail2Ban] <name>: stopped on `uname -n`
+             Date: `LC_TIME=C date -u +"%%a, %%d %%h %%Y %%T +0000"`
+             From: <sendername> <<sender>>
+             To: <dest>\n
+             Hi,\n
+             The jail <name> has been stopped.\n
+             Regards,\n
+             Fail2Ban" | /usr/sbin/sendmail -f <sender> <dest>
+
+# Option:  actioncheck
+# Notes.:  command executed once before each actionban command
+# Values:  CMD
+#
+actioncheck = 
+
+# Option:  actionban
+# Notes.:  command executed when banning an IP. Take care that the
+#          command is executed with Fail2Ban user rights.
+# Tags:    See jail.conf(5) man page
+# Values:  CMD
+#
+actionban = printf %%b "Subject: [Fail2Ban] <name>: banned <ip> from `uname -n`
+            Date: `LC_TIME=C date -u +"%%a, %%d %%h %%Y %%T +0000"`
+            From: <sendername> <<sender>>
+            To: <dest>\n
+            Hi,\n
+            The IP <ip> has just been banned by Fail2Ban after
+            <failures> attempts against <name>.\n\n
+            Here is more information about <ip>:\n
+            `/usr/bin/whois <ip> || echo missing whois program`\n
+            Regards,\n
+            Fail2Ban" | /usr/sbin/sendmail -f <sender> <dest>
+
+# Option:  actionunban
+# Notes.:  command executed when unbanning an IP. Take care that the
+#          command is executed with Fail2Ban user rights.
+# Tags:    See jail.conf(5) man page
+# Values:  CMD
+#
+actionunban = 
+
+[Init]
+
+# Default name of the chain
+#
+name = default
+
+
+# vim: filetype=dosini
diff --git a/fail2ban/files/sendmail.conf b/fail2ban/files/sendmail.conf
new file mode 100644 (file)
index 0000000..d4c5153
--- /dev/null
@@ -0,0 +1,76 @@
+# Fail2Ban configuration file
+#
+# Author: Cyril Jaquier
+#
+#
+
+[INCLUDES]
+
+before = sendmail-common.conf
+
+[Definition]
+
+# Option:  actionstart
+# Notes.:  command executed once at the start of Fail2Ban.
+# Values:  CMD
+#
+actionstart = printf %%b "Subject: [Fail2Ban] <name>: started on `uname -n`
+              Date: `LC_TIME=C date -u +"%%a, %%d %%h %%Y %%T +0000"`
+              From: <sendername> <<sender>>
+              To: <dest>\n
+              Hi,\n
+              The jail <name> has been started successfully.\n
+              Regards,\n
+              Fail2Ban" | /usr/sbin/sendmail -f <sender> <dest>
+
+# Option:  actionstop
+# Notes.:  command executed once at the end of Fail2Ban
+# Values:  CMD
+#
+actionstop = printf %%b "Subject: [Fail2Ban] <name>: stopped on `uname -n`
+             Date: `LC_TIME=C date -u +"%%a, %%d %%h %%Y %%T +0000"`
+             From: <sendername> <<sender>>
+             To: <dest>\n
+             Hi,\n
+             The jail <name> has been stopped.\n
+             Regards,\n
+             Fail2Ban" | /usr/sbin/sendmail -f <sender> <dest>
+
+# Option:  actioncheck
+# Notes.:  command executed once before each actionban command
+# Values:  CMD
+#
+actioncheck = 
+
+# Option:  actionban
+# Notes.:  command executed when banning an IP. Take care that the
+#          command is executed with Fail2Ban user rights.
+# Tags:    See jail.conf(5) man page
+# Values:  CMD
+#
+actionban = printf %%b "Subject: [Fail2Ban] <name>: banned <ip> from `uname -n`
+            Date: `LC_TIME=C date -u +"%%a, %%d %%h %%Y %%T +0000"`
+            From: <sendername> <<sender>>
+            To: <dest>\n
+            Hi,\n
+            The IP <ip> has just been banned by Fail2Ban after
+            <failures> attempts against <name>.\n
+            Regards,\n
+            Fail2Ban" | /usr/sbin/sendmail -f <sender> <dest>
+
+# Option:  actionunban
+# Notes.:  command executed when unbanning an IP. Take care that the
+#          command is executed with Fail2Ban user rights.
+# Tags:    See jail.conf(5) man page
+# Values:  CMD
+#
+actionunban = 
+
+[Init]
+
+# Default name of the chain
+#
+name = default
+
+
+# vim: filetype=dosini
diff --git a/fail2ban/files/ssh-jail.conf b/fail2ban/files/ssh-jail.conf
new file mode 100644 (file)
index 0000000..fe58df8
--- /dev/null
@@ -0,0 +1,12 @@
+
+[ssh]
+
+enabled  = true
+port     = ssh
+filter   = sshd
+logpath  = /var/log/syslog.d/auth.log
+action   = %(action_mw)s
+maxretry = 6
+
+
+# vim: filetype=dosini
diff --git a/fail2ban/init.sls b/fail2ban/init.sls
new file mode 100644 (file)
index 0000000..873de30
--- /dev/null
@@ -0,0 +1,95 @@
+
+fail2ban:
+  pkg.installed:
+    - name: fail2ban
+    - watch_in:
+      - service: fail2ban
+  service.running:
+    - name: fail2ban
+    - enable: True
+    - require:
+      - pkg: fail2ban
+    - watch:
+      - pkg: fail2ban
+
+fail2ban-pkgs:
+  pkg.installed:
+    - pkgs:
+      - python-pyinotify
+    - require:
+      - pkg: fail2ban
+
+/etc/fail2ban/action.d:
+  file.directory:
+    - user: root
+    - group: root
+    - dir_mode: 755
+    - file_mode: 644
+    - makedirs: True
+    - require:
+      - pkg: fail2ban
+
+{% for filename in ('sendmail-common.conf', 'sendmail.conf', 'sendmail-whois.conf') %}
+file2ban_{{ filename }}:
+  file.managed:
+    - name: /etc/fail2ban/action.d/{{ filename }}
+    - source: salt://fail2ban/files/{{ filename }}
+    - user: root
+    - group: root
+    - mode: 644
+    - require:
+      - file: /etc/fail2ban/action.d
+    - template: jinja
+    - backup: minion
+{% endfor %}
+
+/etc/fail2ban/jail.conf:
+  file.managed:
+    - source: salt://fail2ban/files/jail.conf
+    - user: root
+    - group: root
+    - mode: 644
+    - template: jinja
+    - backup: minion
+    - require:
+      - pkg: fail2ban
+      - pkg: fail2ban-pkgs
+    - watch_in:
+      - service: fail2ban
+
+/etc/fail2ban/jail.d:
+  file.directory:
+    - user: root
+    - group: root
+    - dir_mode: 755
+    - file_mode: 644
+    - makedirs: True
+    - require:
+      - pkg: fail2ban
+
+/etc/fail2ban/jail.d/ssh.conf:
+  file.managed:
+    - source: salt://fail2ban/files/ssh-jail.conf
+    - user: root
+    - group: root
+    - mode: 644
+    - backup: minion
+    - require:
+      - pkg: fail2ban
+      - file: /etc/fail2ban/jail.d
+    - watch_in:
+      - service: fail2ban
+
+/etc/fail2ban/jail.d/postfix.conf:
+  file.managed:
+    - source: salt://fail2ban/files/postfix-jail.conf
+    - user: root
+    - group: root
+    - mode: 644
+    - backup: minion
+    - require:
+      - pkg: fail2ban
+      - file: /etc/fail2ban/jail.d
+    - watch_in:
+      - service: fail2ban
+
diff --git a/top.sls b/top.sls
index 3c8af591bd37045b372aac4643da7bf08307d267..5dee2aeb750a7f0e0a925db55c1b1ba5eff8a23c 100644 (file)
--- a/top.sls
+++ b/top.sls
@@ -1,5 +1,6 @@
 base:
-  'ns2.uhu-banane.de':
+  'ns\d+.uhu-banane.de':
+    - match: pcre
     - debian.apt
     - basic.editors
     - basic.localization
@@ -9,14 +10,5 @@ base:
     - basic.shells
     - basic.skel
     - postfix.common
+    - fail2ban
 
-  'ns3.uhu-banane.de':
-    - debian.apt
-    - basic.editors
-    - basic.localization
-    - debian.sysvinit
-    - basic.pkgs
-    - basic.rsyslog
-    - basic.shells
-    - basic.skel
-    - postfix.common