summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2011-07-30 19:59:36 +0200
committermakefu <github@syntax-fehler.de>2011-07-30 19:59:36 +0200
commitb1a25ac77d04c9d00b959e9c13b36a293d93824e (patch)
tree2dcc5c5d8efcbc5a54c74c5534b1cf777124cd9a
parentecdadaed92fc9382920f95620ccc60a782c31723 (diff)
parent26bf26e3ecb351eadfc3cdc8afd4d8d8b9908da5 (diff)
Merge branch 'master' of github.com:krebscode/hosts
-rw-r--r--hosts/bergwerk12
-rw-r--r--hosts/fuerkrebs10
2 files changed, 16 insertions, 6 deletions
diff --git a/hosts/bergwerk b/hosts/bergwerk
index bd07f18e..611c0899 100644
--- a/hosts/bergwerk
+++ b/hosts/bergwerk
@@ -2,10 +2,10 @@ Subnet = 10.7.7.79
Subnet = 42:a7ff:3577:0526:3986:650f:c175:30a5/128
-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAuS2vq1xzA5ZPd3ZGzUWgTKcnoyiSs1G/z16W2EZmIBN9MPg/0zNw
-JgM5DP6umdDcTjSGBAI2L/nbWZ3GPYGxx/Kmq68yx+VyrW2m4g3a+2vlM64/ebIb
-X1L3+G7vb4ipVetkG3Q+VvZMYn3iXma5UtJVeN+O0Mz4ult4E8WpjDFuC81Ohzta
-0je9qY9hdiR2eZWSYTZql6N33djUm2blmIz2+pY1HhInHFlWA0EKxjGJ/DkHkVoj
-UjuLL3e7uv4wp3ed6Zisr7ZlR8u7yR0uyHIMDXtehRdBkgDOhricy9tFqoIlTHcC
-y6oMLDNSqwmMikQ22iCYVle/jRF3SnK2mwIDAQAB
+MIIBCgKCAQEAuCX8FVI6xQepPf0goaErA35grHcBNbYvzKIXzEIOEuxiVLX4FXoY
+aHdUaz9Z2/rECuDQCVzke3TLZgBn9ai7ruT5U077h0q69pS/vI/Hr2e3s50tQVcu
+eD4DuudxIZ+DlMSeEaYed5OcH7C7KGL8Dg/2kzoTUjFqG2zwfHft8/Yszkwzt7/W
+FwIkekkPTY+dpLVlFBKQnqXtcB5FvgL55MwhLXbQRWIqJnOuMdqzp4KwHku2PVs6
+0LW8saAzxTzIyEjJGd6rT+zDirhKmmWd/08YhgJ00XiYNkrFFyJPwtF/0CISTjBO
+Uy0jafckZyAleQCzhg2753fEh8+n8NARNQIDAQAB
-----END RSA PUBLIC KEY-----
diff --git a/hosts/fuerkrebs b/hosts/fuerkrebs
new file mode 100644
index 00000000..065a97aa
--- /dev/null
+++ b/hosts/fuerkrebs
@@ -0,0 +1,10 @@
+Subnet = 10.7.7.188
+Subnet = 42:0f19:8a1e:7865:721b:2378:bef7:1159/128
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA1HoKqh7HvXCKybe2FNBI/wuOvkZuftL0/DDZfZtPlCRtdcOA4XFj
+hQng5+VE3NG0yKcRs59U8iHSeN9b7Is1YF4q0RtM9YQTDhvS/vfpHDq42ftjMs/e
+MIFvYBGr2WIOzOYPiACURRcaMmoAViqK2Bwda45jORPUGo1afibH9UcDs76lFuaI
+f3mUZvLlqdJEtG040WoT1douGWtUWkCB6/pVUgLAurncOz/XiSI3GFzkMUY+0pT6
+0G34AcYqvdQyxH3x0ebclFlfY2aPStf6bGMejcpRJm4M02xF809DVYlUL3mG6krF
+MdWP85dCQ4V/RL0HdZ9PEjlVhgNOF1aQowIDAQAB
+-----END RSA PUBLIC KEY-----