Merge branch 'master' of github.com:krebscode/painload

Conflicts:
	god/temper/Makefile
	god/temper/collectd-temper.sh

20 files changed, 83 insertions, 71 deletions

diff --git a/retiolum/hosts/TodesBrot b/retiolum/hosts/TodesBrot
deleted file mode 100644
index f76b72b2..00000000
--- a/retiolum/hosts/TodesBrot
+++ /dev/null
@@ -1,9 +0,0 @@
-Subnet = 10.243.0.12/32
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAzGIijXaoIRG09v5sIXyVdqdpDruPMqKJfvZUXCF/POMCZEsZ4tjd
-jHHdbTfREExvSNBUxS6GaYwg/HR2R7nprzOazSN9kzp9fmFJofbCOxz6X/8O/fMM
-gTBmZzYu4cfysjTD5tsrJp/dQOZ0wKpUXBOWWWDUTLM9Zo3+6Bxe/6pN+gphvl6m
-ReIAwl34QkZ24mq1W4YZofU2PxLxnhtuBgXuJRfn8FDlgKKPhPpKX070J5pamzpp
-1/Idxl0zTmoKeXWhJ0wY0SNeglaWgH1P2EeNUNoVEX4Egk4XQGkzOfShRG7zoJMA
-tKJlNZOw/4EF3E/IM8mG1yG3NqtFlIyNYQIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/albi10 b/retiolum/hosts/albi10
new file mode 100644
index 00000000..5f152a1f
--- /dev/null
+++ b/retiolum/hosts/albi10
@@ -0,0 +1,11 @@
+Address = 184.154.13.15
+Subnet = 10.243.0.10
+Subnet = 42:aaa9:4ba3:8c43:bdd8:2cc8:29a0:e8e6/128
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA0Jz5rQ7NpIQWwhDsrZHlJYAnC1k1onl2ln/6CJbdV9t3gG2hlx/9
+0SEARo6sq9fftyzzZd3iY4WK7+zRXJFXHsLmDa6mq8Mme7Yv+YHZoHPTm9c3tN3v
+laiV/qAdoi/sv43DCo7JywI2lTW1pPxuitXuud2ajd7GXuCoRqFRqLtaURorVKkW
+4j9UGpMKrEa+CV9wP5jZ57RSPQ7aMq8D4GiMqKDgUeCZnvXxpYWDOEdGNlpuUcWt
+/erC6u50/vnjUkkHx66OmkZe5AX5MmwNp2q4zC4sTh/BRhqk27AmNl5wbp0kL7/B
+hg+r0F8ckrdLc21sSU36lUIeeFa/S+A06QIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/also b/retiolum/hosts/also
deleted file mode 100644
index 59a251a7..00000000
--- a/retiolum/hosts/also
+++ /dev/null
@@ -1,12 +0,0 @@
-Subnet = 42:9c90:a590:e88a:52cf:126f:b710:1a9c/128
-Subnet = 23.42.0.1/16
-Subnet = 10.243.0.50/32
-Compression = 9
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAsnF1eyd/R4qXMGo8UEZ98hnJK+6ZEKUubgdzEwAuSxK40B6nX8Ry
-Euy3v3s0ps/GMdE52gUbFB+bhM99hHiKW+7zcxnoMJ69a9yK6VG0Im+7ib0WTliZ
-llgUfRETQd/2KaIfJWH/nVsBuK0hp1LscroWcoO08BCw6v94q3He8502Bk/ZYZQF
-wD7Y6LldipWKo/K9YtIU3zD3taj2NGnetOc0BRRncSgGiicXJKhtfcs+Ti2Y/ITz
-bFkHnFgB0KnhjwJBumxdmgjHWknlwVkROvmzIgyoXxqEw31bF+g/XzA7RTMXsiFM
-w0SZ15k4HG5L1PWpUyY2Th5yIjMW+sSrhQIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/casino b/retiolum/hosts/casino
new file mode 100644
index 00000000..e35691c3
--- /dev/null
+++ b/retiolum/hosts/casino
@@ -0,0 +1,11 @@
+Subnet = 10.243.0.233
+Subnet = 42:3c1f:ea16:e181:7ab2:c51a:8892:7fb7/128
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAzmZ7x4HVpW8RC3ZkwmNKY/6VGlMKQbpBQtmrUzV1XFxKWZRhH3VI
+NOqlfVpTEaRTorht7R8F1aw9psDDUcg7yuQFcUdoXxBJxwbc1h0FKyZZr5kAIfpS
+ObE0rbBRRqJVAWgztpQAalWC95D73y/+tpHnQ+LRFq9IWeX5+QobaSym1oG4Y0Jz
+STSbw2ksjH8CuWHS5TjZr50Nyx6cH99HABDnadxhLBtQriJPSYRYdWyp7tYrW3jd
+As28mxkyFj0sFV3IJ/bYfZD9KSGg1KjQu+c73xKOBUhNtSHFjUzN5myYGd/nWCw8
+0PUReLrWC1ZHYPzqiwelTHcNJ3UcojpO9wIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/euer b/retiolum/hosts/euer
index 391705c5..d2240575 100644
--- a/retiolum/hosts/euer
+++ b/retiolum/hosts/euer
@@ -1,4 +1,4 @@
-Address = euer.krebsco.de
+#Address = euer.krebsco.de
 Address = 84.23.67.119
 Subnet = 42:974a:3ecf:3c49:06c0:4cd1:3c6f:59d9/128
 Subnet = 10.243.0.95/32
diff --git a/retiolum/hosts/filebitch b/retiolum/hosts/filebitch
deleted file mode 100644
index d23f98f2..00000000
--- a/retiolum/hosts/filebitch
+++ /dev/null
@@ -1,10 +0,0 @@
-Subnet = 42:0356:a364:cc79:4c96:2c7c:13fc:0c5b/128
-Subnet = 10.243.131.98/32
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAoqTUa54dkplzU6IqWdvCiGM8FLpZ6X6AmgGgl5r9RZ+Af08iy4Js
-FPdco+1Lj5OthXJnd5Xx8cO5qQx5CRzUN59ec8o0jxQOBZ5EpuN42RLMmQNBJWm7
-moVpEDuPQTHQrlyvsYwXOx1+T4rvSnG7hldiHoCL4XVn8FpZLPMXL5alGHSuNuYq
-dG++5LtPpmRLOg0Pwlk3nVfJpKKn4u2FVmhmxe9CdV9c5B5Ze0nVH6sekaG0gXzX
-ktoJG83/yc2XYhn+rel4kvLFyP/XqdAxsO6v7mpmQVNgsppqm2A9unDacTfOG//z
-2O+/dHkkW7ukOfk2Tr6z/CSDDxySMzx2NwIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/filebitchin b/retiolum/hosts/filebitchin
new file mode 100644
index 00000000..cd67b1ab
--- /dev/null
+++ b/retiolum/hosts/filebitchin
@@ -0,0 +1,10 @@
+Subnet = 10.243.221.149
+Subnet = 42:9efb:ae54:fdbf:6ec1:6167:6aab:a41e
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAqtid32pdLNTOasAf8JW16SmmFJmwx/3PucO2Bpo34dDYWFm5uxyH
+MYDTYDXLFRioiWGX2b1/5x7Oqjn0hP3FPuSAWPpyWEspMNmrpwZ1iA3hxQJEvQav
+juBQzh18f6JJow+SoosiAfdr9pSoosZEKKbcwiWZ3od05BdKnogQ7bJI1mjSC0xb
+9zAtlEKXhtmS8SJAyWKPQjC3coHlWoRq61zsI3/20074mUbFHsXj3jZPgn4Dc2RV
+BYx+ZDGviIMhQEKXn9C3VFfVrLZbgheE5xiKFkqRMTWwlbNH/MXwNsrlJq3uAy9H
+YuJhTY5XxUjkwCVky5m9QYbxEpl4hlvpnQIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/iiso b/retiolum/hosts/iiso
deleted file mode 100644
index 3700cec5..00000000
--- a/retiolum/hosts/iiso
+++ /dev/null
@@ -1,11 +0,0 @@
-Subnet = 42:b2cd:6c75:d528:e736:ec4e:fc39:8bdc/128
-Subnet = 10.243.0.37/32
-Compression = 9
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAvsjBR0FUkjiNNLhz3AArosLqEiLZY7O8L6LorfUplD/IjG9P7XXx
-ry4gbKEH57GPn11IOPP1AKQcz7SfW7EwvUS8U1IZgkQq8BuuD3oGBQxOqwnOwzVN
-+XKSZjUfmT/Uf81PHfWE52BfbitI+SBTi0m9cIuhgyYRAjD7We97ogkWDogBXKvC
-p1YYH44wcLte7lzWmId9hNOJtTu4KnCVgtXi/DYVLvuofrEk28DhhRSFiun4dkN6
-qMl8ZWOILOhUVSZN+cx/dslCwoog1FuEj7TyuhJFj8yoWIdI4xUGugzmV6npzTvU
-bLkcVfuQQYlIV9D7YYPyEFB11U6mifZ5uwIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/incept b/retiolum/hosts/incept
index 1ff5365b..348e44b1 100644
--- a/retiolum/hosts/incept
+++ b/retiolum/hosts/incept
@@ -1,5 +1,5 @@
 Address = 77.95.224.63
-Address = incept.krebsco.de
+#Address = incept.krebsco.de
 Address = 2a00:7b80:3008:3::fafc:241
 Subnet = 10.243.0.174
 Subnet = 42:a2fc:1c89:65c7:6e60:1f62:eaf9:e9b6/128
diff --git a/retiolum/hosts/juhulian b/retiolum/hosts/juhulian
new file mode 100644
index 00000000..d9da75aa
--- /dev/null
+++ b/retiolum/hosts/juhulian
@@ -0,0 +1,11 @@
+Subnet = 10.243.0.38
+Subnet = 42:449f:b00a:e973:514c:3e9f:97ed:aac2/128
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAnNyOsNItOzNQndheZ3ppOMWvIOuO1wgLXArINS1ORcgIAJmLpqDI
+whsZFCVifwAXsdeBJyyZOPZrc2PQ4F3KB9ByX6PQ9jqAhun1aE9SDDqp+woOrTlP
+BtJ/8zAmRhrfak61TxpeTndLk95xOLaCwvS2P4SJLIcyutTbbFdBCqpu7cFUGOOP
+qCKLX7/mv2L+GNmQAnWZ5HwXQzBS6gNaNIcQ8mPCUAIZgRU2T83x/tnyH1RlATK2
+lYUWRM0ie+dRMhiDcwmmZrwYl8wzyvuBPEr/p8ZBM2tua8GlQzJUJl44AiAcx3w9
+0EB5MIRL5Qb0yBvXD0yR+bDizqvhd40LvQIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/khackplug b/retiolum/hosts/khackplug
new file mode 100644
index 00000000..c149d93b
--- /dev/null
+++ b/retiolum/hosts/khackplug
@@ -0,0 +1,11 @@
+Subnet = 10.243.217.107
+Subnet = 42:ebe3:90b0:539a:6ef0:0910:b724:00b1
+                                                                                                                               │
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAvytShP1vgYLDYJhiC26Vc1/cVJOptUnuyTc8Id9vkCkgHZRpKs3T
+jO2KRaQMDWMXfXkMfVp84/2Q85hpUzYqXQHaNzitg9nHGR2n+a6zfwNKWAm6n2WK
+AMsPf1weamzs6EfCm5WztqenoHKNUxpzXVyLJES/WK6e5ba7FEpszZx+ydoc5GjL
+kezqch5p+U/J2JoUx3aIpQuWvc0i/4KYOuGzlWgUYLNyqL1m3gBkahiPuOtzf9Ul
+EP8QY/GQa1HTFuhLS0Y5nVjZvWnjVVEloXbq9SD2I2fc4GD4+F8wtFMsJyEF2qxY
+XfSLTlpHaJbSBNiopQyWG62RZda/p0yq3QIDAQAB
+-----END RSA PUBLIC KEY-----                                                                                                   
diff --git a/retiolum/hosts/laqueus b/retiolum/hosts/laqueus
index cf4ecad5..0bdef307 100644
--- a/retiolum/hosts/laqueus
+++ b/retiolum/hosts/laqueus
@@ -1,5 +1,5 @@
-Subnet = 42:0:0:0:0:0:0:1a1a/128

-Subnet = 10.243.0.12/32

+Subnet = 42:0:0:0:0:0:0:1a1a/128
+Subnet = 10.243.0.12/32
 
 -----BEGIN RSA PUBLIC KEY-----
 MIIBCgKCAQEAy9lnH4qDSYeNbpzpcQyq2LzzxkVy2N1vGgKkVttzx0cgMvyRm3aX
diff --git a/retiolum/hosts/minikrebs b/retiolum/hosts/minikrebs
index ad7278e2..b0d60558 100644
--- a/retiolum/hosts/minikrebs
+++ b/retiolum/hosts/minikrebs
@@ -1,5 +1,5 @@
 Subnet = 10.243.1.1/32
-Subnet = 42:0:0:0:0:0:1:1/128
+#Subnet = 42:0:0:0:0:0:1:1/128
 -----BEGIN RSA PUBLIC KEY-----
 MIIBCgKCAQEA0fu8F+XJ6hHsIj8QtdSZIhE+Ae2sEIY4dHcnHbCOeHJlOQQDJrme
 frmG65BX4BMcClUyhvvMwlZIerFwsJoEwa39lB3/Y58OwSS9cNCZTShQPbyVy5wo
diff --git a/retiolum/hosts/muhbaasu b/retiolum/hosts/muhbaasu
index d758fef2..83fb3933 100644
--- a/retiolum/hosts/muhbaasu
+++ b/retiolum/hosts/muhbaasu
@@ -1,5 +1,5 @@
 Address = 217.160.206.154
-Address = muhbaasu.de
+#Address = muhbaasu.de
 Subnet = 10.243.0.200
 Subnet = 42:3f88:faa3:ae13:6ff7:13ee:17d7:421a/128
 
diff --git a/retiolum/hosts/nomic b/retiolum/hosts/nomic
new file mode 100644
index 00000000..f418233c
--- /dev/null
+++ b/retiolum/hosts/nomic
@@ -0,0 +1,10 @@
+Subnet = 10.243.0.110/32
+Subnet = 42:02d5:733f:d6da:c0f5:2bb7:2b18:09ec/128
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAwb8Yk/YRc17g2J9n960p6j4W/l559OPyuMPdGJ4DmCm3WNQtxoa+
+qTFUiDiI85BcmfqnSeddLG8zTC2XnSlIvCRMJ9oKzppFM4PX4OTAaJZVE5WyCQhw
+Kd4tHVdoQgJW5yFepmT9IUmHqkxXJ0R2W93l2eSZNOcnFvFn0ooiAlRi4zAiHClu
+5Mz80Sc2rvez+n9wtC2D06aYjP23pHYld2xighHR9SUqX1dFzgSXNSoWWCcgNp2a
+OKcM8LzxLV7MTMZFOJCJndZ77e4LsUvxhQFP6nyKZWg30PC0zufZsuN5o2xsWSlA
+Wi9sMB1AUR6mZrxgcgTFpUjbjbLQf+36CwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/oxberg b/retiolum/hosts/oxberg
deleted file mode 100644
index c267b582..00000000
--- a/retiolum/hosts/oxberg
+++ /dev/null
@@ -1,11 +0,0 @@
-Address = 84.23.80.172
-Subnet = 42:c154:3219:a91c:77eb:91bb:2f18:ff75/128
-Subnet = 42.160.213.134/32
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA57j66efrYrB7jlBVu6XD6433n/j1QL86KI/l7BCVTE11mJrElElc
-YSAOB44arnFurSlU8RZIZAC4gnScmDnjJqCqudxps4wO0JTPqUCvUXkaZQ1fUf7W
-H00K05Jkrr6xFHyDwZNrU4uitBfMuAXlUE2A0sFLJiBmFLMSS0abaUg0ALRwFsMI
-5ftLHZPMV/TwUollCHQTfwMiMGo28WBm+nYvY+nUZRu3sx8HPLskYWmvt9giu7eo
-iQCDee/bHym5Ax9vETpCrkZITq2MJtQdJX46iwvlgKxsV7VkCXAtmU3lMLyTSeRX
-582RdmjFP2DdTPEulbL2YyfXVuLs0QIiRQIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/pico b/retiolum/hosts/pico
index 8fc732b8..b08b450d 100644
--- a/retiolum/hosts/pico
+++ b/retiolum/hosts/pico
@@ -1,4 +1,4 @@
-Address = pu11.de
+Address = 78.111.78.33
 Subnet = 10.243.0.102/32
 Subnet = 42:b103:275c:1723:edc8:b24d:452b:352a/128
 -----BEGIN RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/pigstarter b/retiolum/hosts/pigstarter
index 838d9587..6904f4e0 100644
--- a/retiolum/hosts/pigstarter
+++ b/retiolum/hosts/pigstarter
@@ -1,5 +1,5 @@
 Address = 5.45.180.187
-Address = pigstarter.de
+#Address = pigstarter.de
 Subnet = 10.243.0.153
 Subnet = 42:9143:b4c0:f981:6030:7aa2:8bc5:4110/128
 -----BEGIN RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/rubus b/retiolum/hosts/rubus
new file mode 100644
index 00000000..0ba98c0d
--- /dev/null
+++ b/retiolum/hosts/rubus
@@ -0,0 +1,11 @@
+Subnet = 10.243.137.174
+Subnet = 42:7941:278b:bd29:f0ab:9c09:e5e9:7965
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAznS+XyF278SXTVgK9OG8SDu+pffDZtBeYfyyNHAVt/2EeE3cfIJZ
+3iBXMcD8/yelCWMY6S+MNNnP+KqyCCVuG8rvhpMjB/RGzqLFSTLZoQOmC/O9S3i3
+TKKr4zxyBxjSFAPSOeHbrERAyREg/GNrLxX/SzT/yOgRDjZLA1Z5CgunXVeiB7BF
+9jL1U6AahFD/6NzaPAc4+mSAQJzGw4P5TeVvAlhf96x5I0sBc09Vu87sL9NJOpi8
+hqWYhLWjZF4CRusjV3SL9kUj668CZO1S9Ooe3FO37Pa0fftDLQekCpBDrtoNr6LW
+O2BYBEXsQn5ooZgAysm7mi9Hbdc3dPl5/QIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/xso b/retiolum/hosts/xso
deleted file mode 100644
index 1f035a78..00000000
--- a/retiolum/hosts/xso
+++ /dev/null
@@ -1,10 +0,0 @@
-Subnet = 42:fb16:96ad:c849:f5d4:2170:103d:e86b/128
-Subnet = 42.124.174.80/32
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA1p1WG0yDOku0u8XPzN2BAcrkVeR11c8Si3sz2BNoYPitdA2wW/TE
-mHjGw4Dxt1Q+lWmxtsNnV2x5IoZBSIovS8Tuj4O6mVTmgSJSta988gzmeImQksb6
-+/d4LQmqc6/u24sKrWEPQ7sCpb5sPGr1K1yLNtAnD7pt3rGiX/VK/SKBYKpB5wGf
-snRHB5fj/4yc5M7YjQI+TO0jTKdlf9B4JrRX/DhbmZ9n/EPGREGUgrDyi66Jk8ea
-yRyCg/5UcHD6z74ZN6Is4bbQXZaQ4S61r+JmFebsC2CxkZ20jayDBRKcQL6yH0ZZ
-a1rAdUqyh894vNctn52GAp7P96dhwAnwEQIDAQAB
------END RSA PUBLIC KEY-----