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/temperator | |
| parent | b306f47b59f5b94ccacb001c1b617c625664dbbe (diff) | |
| parent | b96e107487fa22d56d4413012cc70845fb739074 (diff) | |
Merge branch 'master' of https://github.com/krebscode/hosts
Conflicts:
bergwerk
Diffstat (limited to 'hosts/temperator')
| -rw-r--r-- | hosts/temperator | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/hosts/temperator b/hosts/temperator new file mode 100644 index 00000000..d441e758 --- /dev/null +++ b/hosts/temperator @@ -0,0 +1,10 @@ +Subnet = 10.7.7.200 +Subnet = 42:0b56:87fb:b3ab:677f:1158:bfa0:b937/128 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEArV5wUD4DqM0RoqL47aPb4EcK8Fi7s+PaFwSqVYibMvjeh/zbRUqa +GQzEWa9ZR9dIzc0YNQKLOSKsiJNpdEwsWT5kUIUQq/YpFAQjcb/vEFbfZwesG08U +bmkiqXBVaRDYgdGvnJsfkxVYFuTBKstZk5zdK4/uUSVV6oB3G1xP29Umpjn13Dc6 +28F4aYSQ6U8wJaGpZWXiQrmGtFwaM3gY7MCGq3L/5ec+qo7/zqC3BNYYbuFPycs5 +O3H/Gu1E060YsThhtC4NbChupf0llJcHa7wpPyE2f31YBAQZMo5NpmQqWWLuLqSk +sT1QtjqIsNcMBK9ogxGb6fcMmycOUSsEFwIDAQAB +-----END RSA PUBLIC KEY----- |