diff options
author | Felix Richter <Felix.Richter@syntax-fehler.de> | 2011-05-10 21:08:59 +0200 |
---|---|---|
committer | Felix Richter <Felix.Richter@syntax-fehler.de> | 2011-05-10 21:08:59 +0200 |
commit | 135fcee283288985e825181ebcfcae359e4975c8 (patch) | |
tree | 88dd18bec97727687d970a82c97a0eff4780512b /hosts/ITART | |
parent | d14a56d2ac17233dcadac87ecab090b26f8d7150 (diff) | |
parent | b54e30f1d4b37f9b01be4434d6b03e6301c46e14 (diff) |
Merge remote-tracking branch 'oldrepo/master'
Conflicts:
krebs: newline deleted
miefdahome: local net deleted
supernode: replaced ip with dns entry
Diffstat (limited to 'hosts/ITART')
-rw-r--r-- | hosts/ITART | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/hosts/ITART b/hosts/ITART new file mode 100644 index 00000000..953c0995 --- /dev/null +++ b/hosts/ITART @@ -0,0 +1,6 @@ +Subnet = 10.7.7.22 +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBANihbPlgirJ63MpMX283M+SjW6JgEhXmt1zcRuOyunbUq6Yt+w4sVtN8 +n2dZ960cTnAXkM1mvMhIcI5p6ZwfdorThJV2+F9eb+84x3GiDLTZ2eL0UefxOSLG +OILFFu5t4Y82MCreyHV4GZDrb2Sz0L1t6r8DmyU91MjXkYBLq5g/AgMBAAE= +-----END RSA PUBLIC KEY----- |