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 | 04a0761562ab28decd7cc7e283686ac7d320cbf7 (patch) | |
tree | 588e6fff3bc8a7e0306baafb897dcb5edc995955 /retiolum/hosts/tart | |
parent | 7a347d517ceec86c4bb2aed5847e42ef9390aca0 (diff) | |
parent | a87fa79e491911ebbf13697879286300c255f13e (diff) |
Merge remote-tracking branch 'oldrepo/master'
Conflicts:
krebs: newline deleted
miefdahome: local net deleted
supernode: replaced ip with dns entry
Diffstat (limited to 'retiolum/hosts/tart')
-rw-r--r-- | retiolum/hosts/tart | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/retiolum/hosts/tart b/retiolum/hosts/tart new file mode 100644 index 00000000..986140ee --- /dev/null +++ b/retiolum/hosts/tart @@ -0,0 +1,6 @@ +Subnet = 10.7.7.123 +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBALvZ4rLz0soCzkyOraC1aKtJzfVqYd2je6rkuaV12CLybCUc6YXaW/HP +rzJyDGmdh355kU4FNNyjnWP/U/juhMaeYFyTUWCRVXdqvDdeiEe/EJ0g+fFGKvPY +DEFo3VMCEkrXKuwDBQP02b4xmAWWnVBityGv5tgDFjl9uXh/SzL1AgMBAAE= +-----END RSA PUBLIC KEY----- |