daily autocommit

diff --git a/icinga2/icinga2.conf b/icinga2/icinga2.conf
index a809b96949804586f2311e23277ee802a9d3b532..b3b54236ef8988f444d48c7888f48347c2b24767 100644 (file)
--- a/icinga2/icinga2.conf
+++ b/icinga2/icinga2.conf
@@ -60,4 +60,4 @@ include_recursive "repository.d"
  * the preferred way is to create separate directories and files in the conf.d
  * directory. Each of these files must have the file extension ".conf".
  */
-include_recursive "conf.d"
+# include_recursive "conf.d"

diff --git a/icinga2/zones.conf b/icinga2/zones.conf
index 2f676a2248578d9bd0a5f00e0de89d58d574bba3..9850a8d74c81688dd389bb2d8807f5e395cd4e3d 100644 (file)
--- a/icinga2/zones.conf
+++ b/icinga2/zones.conf
@@ -4,24 +4,17 @@
  */
 
 object Endpoint "ns1.uhu-banane.de" {
-       host = "ns1.uhu-banane.de"
-       port = "5665"
 }
 
-object Zone "master" {
-       endpoints = [ "ns1.uhu-banane.de" ]
-}
-
-object Endpoint NodeName {
+object Endpoint "ns3.uhu-banane.de" {
 }
 
-object Endpoint "sarah.uhu-banane.de" {
-       host = "sarah.uhu-banane.de"
-       port = "5665"
+object Zone "master" {
+       endpoints = [ "ns1.uhu-banane.de" ]
 }
 
-object Zone "icinga_clients_de" {
-       endpoints = [ NodeName, "sarah.uhu-banane.de" ]
+object Zone "ns3.uhu-banane.de" {
+       endpoints = [ "n3.uhu-banane.de" ]
        parent = "master"
 }
 

diff --git a/iptables/rules.v4 b/iptables/rules.v4
index 528c11d32c7f4ac768139988f889bbc4a0869f1f..58aac4136c6e68c104580d2dcb089703cf75ea58 100644 (file)
--- a/iptables/rules.v4
+++ b/iptables/rules.v4
@@ -1,8 +1,8 @@
-# Generated by iptables-save v1.6.0 on Tue Oct 10 22:26:19 2017
+# Generated by iptables-save v1.6.0 on Thu Oct 12 22:55:37 2017
 *filter
 :INPUT ACCEPT [0:0]
 :FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [6873:1266143]
+:OUTPUT ACCEPT [75:29607]
 :f2b-apache - [0:0]
 :f2b-apache-modsecurity - [0:0]
 :f2b-apache-nohome - [0:0]
@@ -11,6 +11,7 @@
 :f2b-postfix - [0:0]
 :f2b-ssh - [0:0]
 :f2b-sshd - [0:0]
+:icinga2 - [0:0]
 :rejects - [0:0]
 :salt-master - [0:0]
 -A INPUT -p tcp -m multiport --dports 22 -j f2b-ssh
@@ -36,17 +37,31 @@
 -A INPUT -p udp -m multiport --dports 389,636 -j ACCEPT
 -A INPUT -p tcp -m tcp --dport 4505 -j salt-master
 -A INPUT -p tcp -m tcp --dport 4506 -j salt-master
+-A INPUT -p tcp -m tcp --dport 5665 -j icinga2
 -A INPUT -j rejects
 -A INPUT -j NFLOG --nflog-prefix  "IPv4 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-modsecurity -j RETURN
 -A f2b-apache-modsecurity -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-overflows -j RETURN
+-A f2b-apache-overflows -j RETURN
+-A f2b-postfix -j RETURN
 -A f2b-postfix -j RETURN
+-A f2b-ssh -s 58.242.83.8/32 -j REJECT --reject-with icmp-port-unreachable
 -A f2b-ssh -j RETURN
+-A f2b-ssh -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
+-A icinga2 -s 185.48.118.130/32 -j ACCEPT
 -A rejects -s 134.119.179.226/32 -j REJECT --reject-with icmp-port-unreachable
 -A rejects -p tcp -m tcp --dport 23 -j REJECT --reject-with icmp-port-unreachable
 -A rejects -p udp -m udp --dport 137 -j REJECT --reject-with icmp-port-unreachable
@@ -69,4 +84,4 @@
 -A salt-master -j NFLOG --nflog-prefix  "IPv4 Salt Reject " --nflog-threshold 1
 -A salt-master -j REJECT --reject-with icmp-port-unreachable
 COMMIT
-# Completed on Tue Oct 10 22:26:19 2017
+# Completed on Thu Oct 12 22:55:37 2017

diff --git a/iptables/rules.v6 b/iptables/rules.v6
index 04f83685d58224121cdb0abc3b2c3ce03e08a511..011e44a3c49b2f9d5121a96d46f3db7969f48e6f 100644 (file)
--- a/iptables/rules.v6
+++ b/iptables/rules.v6
@@ -1,8 +1,8 @@
-# Generated by ip6tables-save v1.6.0 on Tue Oct 10 22:26:19 2017
+# Generated by ip6tables-save v1.6.0 on Thu Oct 12 22:55:37 2017
 *filter
 :INPUT ACCEPT [0:0]
 :FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [938318:240511532]
+:OUTPUT ACCEPT [50653:5978817]
 :salt-master - [0:0]
 -A INPUT -m conntrack --ctstate ESTABLISHED -j ACCEPT
 -A INPUT -m conntrack --ctstate RELATED -j ACCEPT
@@ -29,4 +29,4 @@
 -A salt-master -j NFLOG --nflog-prefix  "IPv6 Salt Reject " --nflog-threshold 1
 -A salt-master -j REJECT --reject-with icmp6-port-unreachable
 COMMIT
-# Completed on Tue Oct 10 22:26:19 2017
+# Completed on Thu Oct 12 22:55:37 2017