diff options
| author | Felix Richter <github@syntax-fehler.de> | 2011-06-13 03:09:16 +0200 |
|---|---|---|
| committer | Felix Richter <github@syntax-fehler.de> | 2011-06-13 03:09:16 +0200 |
| commit | 9a7a2b4aff649945f948258f7fc3001ba8b66396 (patch) | |
| tree | 3c68c1d2d6e3ae8397a21b48efada65e26deb5f3 | |
| parent | 405a459d43ebae470a90984a583487b3d342eee5 (diff) | |
| parent | 0b200bc577f2bf774c39cec6941a3606ec2079cb (diff) | |
Merge branch 'master' of github.com:krebscode/hosts
| -rw-r--r-- | retiolum/hosts/alphalabs | 1 | ||||
| -rw-r--r-- | retiolum/hosts/armageddon421_de | 11 | ||||
| -rw-r--r-- | retiolum/hosts/exitium_mobilis | 10 | ||||
| -rw-r--r-- | retiolum/hosts/horreum_magnus | 15 | ||||
| -rw-r--r-- | retiolum/hosts/miefda901 | 1 |
5 files changed, 37 insertions, 1 deletions
diff --git a/retiolum/hosts/alphalabs b/retiolum/hosts/alphalabs index 47b7d484..ca99549c 100644 --- a/retiolum/hosts/alphalabs +++ b/retiolum/hosts/alphalabs @@ -1,4 +1,3 @@ -Address = sex.mine.nu Subnet = 10.7.7.10 Subnet = 42:0:0:0:0:0:0:a1fa/128 -----BEGIN RSA PUBLIC KEY----- diff --git a/retiolum/hosts/armageddon421_de b/retiolum/hosts/armageddon421_de new file mode 100644 index 00000000..726dfcda --- /dev/null +++ b/retiolum/hosts/armageddon421_de @@ -0,0 +1,11 @@ +Address = armageddon421.de +Port = 1655 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAqBfXS402JOadodsFB4a/aX/eBkuQxPHjEPpW7QBueEPbCHBAyPnT +GzpC9tJSfkaUfI5pL+kE5vCXqVuLErlJtESENI0FvtfFGHm/KxRwX6QEAiZZT0d0 +C331udvRwqDrjY3HVMcQo7ppcaRHTGNldIATZVVLvm8V8zJ28L/FIioGysNYFuLb +8V5ZVTFpXwUfeJOAbmz0CHB/hiQliP0CR/Y7sZ0dX9/DAg13z2iZc2HA65N1AqZc +L6knsC7DnzjY48d5BhbZXqcCybecx3s4igLuDZjoyHOyAtbR1QueDF/CRVnYsqSs +YItynNjtN9TEEvCG1klvCV7hyM8t2ecpwQIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/exitium_mobilis b/retiolum/hosts/exitium_mobilis new file mode 100644 index 00000000..ab4ee059 --- /dev/null +++ b/retiolum/hosts/exitium_mobilis @@ -0,0 +1,10 @@ +Subnet = 10.7.7.138 +Subnet = 42:0:0:0:0:0:0:AFFF/128 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA1zv7tkHIUxJX2FIFcfakvZZYuI3VH56nkQYlpTUzO9WscMF1BgoH +WKOvHy9QzxAJgqmceroZKbV2PIws/PZgwk7vNGPmmZtzkTuNS+RXd2y1WwKTHpxT +IZ5TKo9AGuU4dcMLAR2xheCJzTRNoxj4UrUgN1WkAqdKhN0Dysglfb+FuUiMdbop +rbzsKhJZKnJOnS00Z9K7ZrTWkYQR6nhMuZ0EMggc+pa5NesHfIoeitXQxB7tz9M4 +6O7xE8ZkECdKXmRBGhSU2ghnCqiomDj9l6L6S6Ms8Q0ElPM78RTh1a32Euj9Ffob +v4gQuzI0fUKe+pbm3VC6B+9awkdd8n1AzwIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/horreum_magnus b/retiolum/hosts/horreum_magnus new file mode 100644 index 00000000..55a213c4 --- /dev/null +++ b/retiolum/hosts/horreum_magnus @@ -0,0 +1,15 @@ +Subnet = 10.7.7.137 +Subnet = 42:0:0:0:0:0:0:affe/128 +-----BEGIN RSA PUBLIC KEY----- +MIICCgKCAgEA4PcEqnw1ZrBgPl0yNO7eQ9aJpV4HKlENVhc/cobLh3dQgbmpw2Qr +MQODR5qPxY+WmyZiQeU5sh8WutfpVn6xBCmR7QDqA+xpPhe/Y6uqWGDjxNftnetz +gphYv/nPGj0Dv5mo2HGPFK1VG+kp9k+vlZb3r+03OVFrIVHsUg6qE4e8o7pN4OmF +O10i85csMyKvSfA/rNHC7RdYP0tVLZTw4ZMTQh5t6zr/foHMr5KPXGVM/hjUWXW+ +ujSxUam6JxS1wk1zFp72Vd3X+JQH1eaDHidm3BBVAvCynyhUyaQh7nSjIDWZdGqQ +GmBcj0M05o1tVGV/7sgQUTNHiLaX6vE35hQoq0Jr2bhfIzjhESLl7HuBMpvDntLE +Tv+c/R3qryTNBBHFZOvYU0qx7I0cq5NLx4BqUXd6EykQvLZ53TyjFlINGQuEZXsj +LOtyAj4n2EEg6WmSUhrB+tyowqumdT8ltemuhZ2zDmimep9EvMiZOVns8VkTqmBw +lRzatTHS5tv6NieDzWTBuMqZiWjgpK8GILUn5e/ecIT2xTSVvo0jzIBwKtFpwf+X +CkBB0tNlYYmDmHJxiKWBsgw27BFmQI59h3wGHXHSDRgShLBjNH62Lm6omDwivDJQ +CJaTYPIsL8sdoCglCIV9NwUkj8tM+cvxZiZjvB3zizNxL57ZqpAcNGsCAwEAAQ== +-----END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/miefda901 b/retiolum/hosts/miefda901 index aabe8135..05216d87 100644 --- a/retiolum/hosts/miefda901 +++ b/retiolum/hosts/miefda901 @@ -1,3 +1,4 @@ +Subnet = 10.7.7.22 Subnet = 42:0:0:0:0:0:111:efda/128 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEApbEYmHf0vEDYa/2aVvWVxEGgC+JJlXcArdxkQooSIpnZfSAfsH0S |