diff options
| author | Chinaman <root@chinaman> | 2011-07-14 06:11:17 +0200 |
|---|---|---|
| committer | Chinaman <root@chinaman> | 2011-07-14 06:11:17 +0200 |
| commit | e6f6b28d1d121d477a0aa033c788234ccad92cb2 (patch) | |
| tree | 490a13515c199540d3f347eaafa5cf618d1b8c96 /hosts/chinaman | |
| parent | b306f47b59f5b94ccacb001c1b617c625664dbbe (diff) | |
| parent | b96e107487fa22d56d4413012cc70845fb739074 (diff) | |
Merge branch 'master' of https://github.com/krebscode/hosts
Conflicts:
bergwerk
Diffstat (limited to 'hosts/chinaman')
| -rw-r--r-- | hosts/chinaman | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/hosts/chinaman b/hosts/chinaman new file mode 100644 index 00000000..d5ab8c1c --- /dev/null +++ b/hosts/chinaman @@ -0,0 +1,10 @@ +Subnet = 10.7.7.6 +Subnet = 42:5a1d:f491:9e47:c4cd:175f:bd87:6da5/128 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAwQWG4shbMq2Y2s2GH05DSR9God0ppslCgXLpM8I+L+khpF8JL83z +KdevKDl0mA4iVnSgqWKVUDCK5IN29wQAlPDiNvBir98vxTeuckvdeTZat0rr0O7t +o4MBMfZ0yXBxruu2/TjCyAkE/VN3h7tfzBh9HUQyVFWjaEhh8v2kOmGLt1UT3hKr +KdFFtCvbIAeHa6axiQvX0kmVZY8n2XK/1pPHSuxkKWUvum1jMplIQ6NewjeTbaan +6hNFcMFwbB333Wan1EKP3D7N/oniGspoyLXdO4Q/AXmfwMJvHdLZri4uLFMdOB/e +n2jo/GTcm7kzUW/IibqyeBvJ6xuTaQXb7QIDAQAB +-----END RSA PUBLIC KEY----- |