summaryrefslogtreecommitdiffstats
path: root/retiolum
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2011-12-27 16:05:32 +0100
committermakefu <github@syntax-fehler.de>2011-12-27 16:05:32 +0100
commitb477d07351ac7f777724f27f003ee9eda116b361 (patch)
tree0d6a146e87e68a32b8bd7e36e9b9021d1f1dede5 /retiolum
parent09d77c782e149b73a5b1cb0a8d1e67825111ae89 (diff)
parente7874d7c84560a9d8e67bb19aadb5e31a60214fd (diff)
Merge branch 'master' of github.com:krebscode/painload
Diffstat (limited to 'retiolum')
-rw-r--r--retiolum/hosts/ThinkArmageddon9
-rw-r--r--retiolum/hosts/TodesBrot12
-rw-r--r--retiolum/hosts/cloudkrebs11
-rw-r--r--retiolum/hosts/supernode2
4 files changed, 16 insertions, 18 deletions
diff --git a/retiolum/hosts/ThinkArmageddon b/retiolum/hosts/ThinkArmageddon
new file mode 100644
index 00000000..cec62e11
--- /dev/null
+++ b/retiolum/hosts/ThinkArmageddon
@@ -0,0 +1,9 @@
+Subnet = 10.243.0.137
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA1EAiyBWICkyB1zHE31fHSbGR1nJJmXSfnrqm9yXRZSGweIKrbsof
+QVcRzM4vsFBRUMBeKW7fzlGcvgXULFRnGelvEl4GRiBMO9odBlBI3t8CjZW7X2N7
+JqCMkB+CRuiHbNYQdRFTozQEfPq+DNh8accD5LjUM6gF0dKUdby5qNeHCfZSxU4v
+YZDRqq/haO4up6m8/S6YhnHPOSaIAu7R7hFaUeB/FPT+s5irKk6WtAiWnIdXb22q
+0zxT4+t9sWFb4V9u/MImggYQVWjk+TfF5KpihBOvExEQsSR8JJcRUJAtN4W0w2Pc
+S4/j9ArKcBj5Wf2qHcJMN5MbwUFW1oMkGwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/TodesBrot b/retiolum/hosts/TodesBrot
index c7f138f1..f76b72b2 100644
--- a/retiolum/hosts/TodesBrot
+++ b/retiolum/hosts/TodesBrot
@@ -1,9 +1,9 @@
Subnet = 10.243.0.12/32
-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA0VQz7tgltBiJgHBfhHLYukrdeQ9K8k3wqrksaqrOtj5ZqN98HoBP
-Trt3bKWNxx0Geszlum7ONpekqmBJN/SUsDaO1rGwY654qFsSWctvg4Pnr0k/6R91
-QCdSklfh19oz+pGY5i4HnZpTouyNnN/AaKP7fqeNsf6AOMO18daODVC5FF43ftHH
-L0ZAjOB6YDhGl+CVBTlFG6HMp81yDAlm7PZEVsd4VRMdQDdx/f6rO9pzkRQmwI/s
-cQjDHEBp5R0bxH5w+8wj1SBusHPYL2UuzQqRNsBzCmAubSi6F2GqPjuUpbZm2trE
-fo2j/RFV/1EPeDo5BsNW4zzRcNgxuOjV9QIDAQAB
+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/cloudkrebs b/retiolum/hosts/cloudkrebs
deleted file mode 100644
index fd70c09b..00000000
--- a/retiolum/hosts/cloudkrebs
+++ /dev/null
@@ -1,11 +0,0 @@
-Address = tinc.krebs.dotcloud.com
-Port = 1655
-Subnet = 42.176.135.119/32
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA9j7kF3Vf9POQbY16LTkpxLvGFlxQ7uEOKmiZFjLfhBi9yt49n+Oj
-hWcr2Pf0iSBhBBqLja429aDe9DXswYUlDwDGau9o6aGWL9mvKBOZ92nXqHT2xv/p
-3V9hCTpV0sAIVNkV/ywRJrxbmKAAGicfdB+TuYWzxSAC6TX/0OdRiSUXqmIpL4xk
-XrjwO7g2iyXYjHpnstsxKtvDCBY2HHGT+PMherjiyD1GUWygq5hKRIXTdb2vauxa
-eao1C3ICkKWrmytYEi/5rLUljBlRqCVyd1Zls/Dfx5VR3ptvFM6u8nUdVW7RYmph
-t86XSPtor97v9xxu+lmLJWIWu1DjDo1XpQIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/supernode b/retiolum/hosts/supernode
index 6058557a..f6806504 100644
--- a/retiolum/hosts/supernode
+++ b/retiolum/hosts/supernode
@@ -1,4 +1,4 @@
-Address = miefda.org
+Address = 46.252.21.5
Subnet = 42:0:0:0:0:0:0:255/128
Subnet = 10.243.0.1/32
Subnet = 0.0.0.0/0