daily autocommit

diff --git a/.etckeeper b/.etckeeper
index 16eb472aba349351cf514aed6d6c224b3bb3f05b..bcdfecd5827bbb2d7ca4dcc42375f9e42f0b632e 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1340,6 +1340,8 @@ maybe chmod 0644 'systemd/resolved.conf'
 maybe chmod 0755 'systemd/system'
 maybe chmod 0644 'systemd/system.conf'
 maybe chmod 0755 'systemd/system/default.target.wants'
+maybe chmod 0755 'systemd/system/fail2ban.service.d'
+maybe chmod 0644 'systemd/system/fail2ban.service.d/netfilter.conf'
 maybe chmod 0755 'systemd/system/getty.target.wants'
 maybe chmod 0755 'systemd/system/getty@.service.d'
 maybe chmod 0644 'systemd/system/getty@.service.d/noclear.conf'

diff --git a/iptables/rules.v4 b/iptables/rules.v4
index 982773edee30565c20fae238979135f0ffec317e..b5cef16fc55ce49462e34e1cdc8ea285e31f8fa0 100644 (file)
--- a/iptables/rules.v4
+++ b/iptables/rules.v4
@@ -1,26 +1,10 @@
-# Generated by iptables-save v1.6.0 on Wed Apr 17 10:33:58 2019
+# Generated by iptables-save v1.6.0 on Mon May 27 11:40:12 2019
 *filter
 :INPUT ACCEPT [0:0]
 :FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [36:10554]
-:f2b-apache - [0:0]
-:f2b-apache-modsecurity - [0:0]
-:f2b-apache-nohome - [0:0]
-:f2b-apache-noscript - [0:0]
-:f2b-apache-overflows - [0:0]
-:f2b-postfix - [0:0]
-:f2b-ssh - [0:0]
-:f2b-sshd - [0:0]
+:OUTPUT ACCEPT [44:8393]
 :icinga2 - [0:0]
 :rejects - [0:0]
--A INPUT -p tcp -m multiport --dports 22 -j f2b-ssh
--A INPUT -p tcp -m multiport --dports 25,465,587 -j f2b-postfix
--A INPUT -p tcp -m multiport --dports 0:65535 -j f2b-sshd
--A INPUT -p tcp -m multiport --dports 80,443 -j f2b-apache-nohome
--A INPUT -p tcp -m multiport --dports 80,443 -j f2b-apache-modsecurity
--A INPUT -p tcp -m multiport --dports 80,443 -j f2b-apache-overflows
--A INPUT -p tcp -m multiport --dports 80,443 -j f2b-apache-noscript
--A INPUT -p tcp -m multiport --dports 80,443 -j f2b-apache
 -A INPUT -s 220.192.0.0/12 -p tcp -m multiport --dports 22 -j REJECT --reject-with icmp-port-unreachable
 -A INPUT -s 222.184.0.0/13 -p tcp -m multiport --dports 22 -j REJECT --reject-with icmp-port-unreachable
 -A INPUT -m conntrack --ctstate ESTABLISHED -j ACCEPT
@@ -36,55 +20,6 @@
 -A INPUT -j rejects
 -A INPUT -j NFLOG --nflog-prefix  "INPUT Reject " --nflog-threshold 1
 -A INPUT -j REJECT --reject-with icmp-port-unreachable
--A f2b-apache -j RETURN
--A f2b-apache -j RETURN
--A f2b-apache -j RETURN
--A f2b-apache -j RETURN
--A f2b-apache -j RETURN
--A f2b-apache-modsecurity -j RETURN
--A f2b-apache-modsecurity -j RETURN
--A f2b-apache-modsecurity -j RETURN
--A f2b-apache-modsecurity -j RETURN
--A f2b-apache-modsecurity -j RETURN
--A f2b-apache-nohome -j RETURN
--A f2b-apache-nohome -j RETURN
--A f2b-apache-nohome -j RETURN
--A f2b-apache-nohome -j RETURN
--A f2b-apache-nohome -j RETURN
--A f2b-apache-noscript -j RETURN
--A f2b-apache-noscript -j RETURN
--A f2b-apache-noscript -j RETURN
--A f2b-apache-noscript -j RETURN
--A f2b-apache-noscript -j RETURN
--A f2b-apache-overflows -j RETURN
--A f2b-apache-overflows -j RETURN
--A f2b-apache-overflows -j RETURN
--A f2b-apache-overflows -j RETURN
--A f2b-apache-overflows -j RETURN
--A f2b-postfix -j RETURN
--A f2b-postfix -j RETURN
--A f2b-postfix -j RETURN
--A f2b-postfix -j RETURN
--A f2b-postfix -j RETURN
--A f2b-ssh -s 89.3.236.207/32 -j REJECT --reject-with icmp-port-unreachable
--A f2b-ssh -s 185.87.121.19/32 -j REJECT --reject-with icmp-port-unreachable
--A f2b-ssh -s 112.85.42.232/32 -j REJECT --reject-with icmp-port-unreachable
--A f2b-ssh -s 185.254.122.114/32 -j REJECT --reject-with icmp-port-unreachable
--A f2b-ssh -s 45.55.80.186/32 -j REJECT --reject-with icmp-port-unreachable
--A f2b-ssh -s 139.59.85.89/32 -j REJECT --reject-with icmp-port-unreachable
--A f2b-ssh -s 80.152.170.99/32 -j REJECT --reject-with icmp-port-unreachable
--A f2b-ssh -s 112.85.42.88/32 -j REJECT --reject-with icmp-port-unreachable
--A f2b-ssh -s 58.218.198.142/32 -j REJECT --reject-with icmp-port-unreachable
--A f2b-ssh -j RETURN
--A f2b-ssh -j RETURN
--A f2b-ssh -j RETURN
--A f2b-ssh -j RETURN
--A f2b-ssh -j RETURN
--A f2b-sshd -j RETURN
--A f2b-sshd -j RETURN
--A f2b-sshd -j RETURN
--A f2b-sshd -j RETURN
--A f2b-sshd -j RETURN
 -A icinga2 -s 185.102.95.107/32 -j ACCEPT
 -A icinga2 -s 162.254.24.33/32 -j ACCEPT
 -A icinga2 -s 185.48.118.128/32 -j ACCEPT
@@ -103,4 +38,4 @@
 -A rejects -p tcp -m tcp --dport 5060 -j REJECT --reject-with icmp-port-unreachable
 -A rejects -p tcp -m tcp --dport 8080 -j REJECT --reject-with icmp-port-unreachable
 COMMIT
-# Completed on Wed Apr 17 10:33:58 2019
+# Completed on Mon May 27 11:40:12 2019

diff --git a/iptables/rules.v6 b/iptables/rules.v6
index d4e80082bad97340e190c8afd8379c39f7ee3155..58d3fff41ae48e01ab513b2ee0a069c9f781163a 100644 (file)
--- a/iptables/rules.v6
+++ b/iptables/rules.v6
@@ -1,7 +1,7 @@
-# Generated by ip6tables-save v1.6.0 on Wed Apr 17 10:33:58 2019
+# Generated by ip6tables-save v1.6.0 on Mon May 27 11:40:12 2019
 *filter
 :INPUT ACCEPT [1:49]
 :FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [27:1613]
+:OUTPUT ACCEPT [16:997]
 COMMIT
-# Completed on Wed Apr 17 10:33:58 2019
+# Completed on Mon May 27 11:40:12 2019

diff --git a/systemd/system/fail2ban.service.d/netfilter.conf b/systemd/system/fail2ban.service.d/netfilter.conf
new file mode 100644 (file)
index 0000000..be0fa83
--- /dev/null
+++ b/systemd/system/fail2ban.service.d/netfilter.conf
@@ -0,0 +1,5 @@
+[Unit]
+After=netfilter-persistent.service
+PartOf=netfilter-persistent.service
+
+# vim: syntax=systemd