diff options
| author | varac <varacanero@zeromail.org> | 2013-06-19 00:40:48 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-06-19 00:40:48 +0200 |
| commit | 2bde90b55b7ff0222d53a3dc062f0df17ad4362e (patch) | |
| tree | bdb71dd6c537c03b35ad7eb8cac93e80cbc94747 | |
| parent | 3cf2453998212d5670a86b48151d6f5e59cb8263 (diff) | |
| parent | 9ed1c82522ffc861c391cd6c31c9a27edc46f27d (diff) | |
Merge branch 'develop' of ssh://code.leap.se/bitmask into develop
| -rw-r--r-- | files/nodes/monitor1/monitor1_ssh.pub | 1 | ||||
| -rw-r--r-- | files/ssh/known_hosts | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/files/nodes/monitor1/monitor1_ssh.pub b/files/nodes/monitor1/monitor1_ssh.pub new file mode 100644 index 0000000..f1d76ee --- /dev/null +++ b/files/nodes/monitor1/monitor1_ssh.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDPVPnfzL5NCFm3R2cDp49x/AyIftl2pZQmIzC33dbBSVCgR3QMMI9sxVCoPm2LWouYoNc3rmZ4/2LYLpdsHSewrNPvSfXv34xbA7aYCT2edQ/QMIMFEM3dIxn6WsqhKGFWppUi1R6vEuGFd1GqLUNW+D5yZ64EbB8ci966MQkbl/9C/yVct++LKfvdBHPo2ga167e1NKllC4gUgw4AjZ6qQv2u56+JfETRHJFgBoqPpwS+pE62Lohi/oowHILEglAhfp14L1VPDPRUlsuB+JZVK+Q53rLqMadZZZ2oZXXQi4k/3st+bRu1RCyAkKQ2HrNrIcdGfRKm5zwd8XZmOXkT
\ No newline at end of file diff --git a/files/ssh/known_hosts b/files/ssh/known_hosts index a55c3d9..d23078b 100644 --- a/files/ssh/known_hosts +++ b/files/ssh/known_hosts @@ -4,6 +4,7 @@ canvasback,canvasback.cdev.bitmask.i,canvasback.cdev.bitmask.net,199.119.112.4 s [elephant]:4422,[elephant.dev.bitmask.i]:4422,[elephant.dev.bitmask.net]:4422,[176.53.69.13]:4422 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2ch5SOj72gGA8kqYoDU8Rvu0CgoErondm7nZvGF+gnj4P0YdKGStnYIPCPyTEA1maRaf3XAkdXbZB/QbN8VkYxJ5N/pqpq0cLPBq/No1FNkXSB/G7QhcILWPuARsXXc5gNV3Fm2QGNTLi7Ji7Y5DpezF9fN3Xao2kb743qI4r4uD0fuwkNccSYsGVZyCkkCzcqoS4vr/zTnTILp+iwq9sP/eaQ9rcICSXmgRleU9vw4E83e5L0llqf1vMGpL/TbX7rNq6T2zOHVcwHkNQwaVa6rSSExYthhEF5St20863DEJSHFa7UzoXdrT9w97WdHQ+p2yMzV3nvOTuhWUP4HCx gadwall,gadwall.cdev.bitmask.i,gadwall.cdev.bitmask.net,199.119.112.5 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQClDyOAJ7TsnJcXbe7bffSqXwrel0UyYabt2Ub2NSo+nbTzQcKSPxBMQIY8SsBlXCSytEIFe2ZhXZcViJ311t8BbuJ6fPTtpkenOgcB1wc3VdJIuiRDg6B/Fq2rEOxzeaVZjLeGaNaF26aV57/gM5E04Yv+d6BMojICtlyosFLzxM/n1Dzp2jask6NEfs9orABhnkG60vx37hJXyUfQTDZ25QHFqlORmFhAERi/Y/OJvjscoGGaLn/VS/7RLVN8n/2UofuliqaON6d2Q7CrdDTtxPpfnUKa3LkrBmIA9zHFk4ZLgZ492FB39DX9vqt05LBP6nNqHfH2NIwZmInJ84qv harrier,harrier.cdev.bitmask.i,harrier.cdev.bitmask.net,198.252.153.46 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDYjJKcQgfxCAsbDSC4rV4blnRY3ZaRAJH2W0q5Gf/kQU4SRDkwh6qBdS7Q4uBt8LARBmwByF1eCNeLyUnaE5W6kZCEbAkp98EQ0vHLtLGDrBXjU9IN4OxrWGGSwJUYyEW2/285oGu73R+qg4VxqBy6REzeAOr0h1vvcKbkRtjroIoYB89bi2ICubGNsGzTIZu/l0nNWn5MIrL1fKixMtH0ALIff/BbHNWbLHYleDAWsHhS6yHal6rWlkCjiZHDu3tZpazCEuO9bf3UrRNlY2EGhNM5D7+Pqkg1Uygzczb7iIK+9KwTSpOvkWBVktaMzqFG/wtWiDtRBAskBCLNpAsN +monitor1,monitor1.bitmask.i,monitor1.bitmask.net,10.5.5.49 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDPVPnfzL5NCFm3R2cDp49x/AyIftl2pZQmIzC33dbBSVCgR3QMMI9sxVCoPm2LWouYoNc3rmZ4/2LYLpdsHSewrNPvSfXv34xbA7aYCT2edQ/QMIMFEM3dIxn6WsqhKGFWppUi1R6vEuGFd1GqLUNW+D5yZ64EbB8ci966MQkbl/9C/yVct++LKfvdBHPo2ga167e1NKllC4gUgw4AjZ6qQv2u56+JfETRHJFgBoqPpwS+pE62Lohi/oowHILEglAhfp14L1VPDPRUlsuB+JZVK+Q53rLqMadZZZ2oZXXQi4k/3st+bRu1RCyAkKQ2HrNrIcdGfRKm5zwd8XZmOXkT mx1,mx1.bitmask.i,mx1.bitmask.net,10.5.5.51 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDPVPnfzL5NCFm3R2cDp49x/AyIftl2pZQmIzC33dbBSVCgR3QMMI9sxVCoPm2LWouYoNc3rmZ4/2LYLpdsHSewrNPvSfXv34xbA7aYCT2edQ/QMIMFEM3dIxn6WsqhKGFWppUi1R6vEuGFd1GqLUNW+D5yZ64EbB8ci966MQkbl/9C/yVct++LKfvdBHPo2ga167e1NKllC4gUgw4AjZ6qQv2u56+JfETRHJFgBoqPpwS+pE62Lohi/oowHILEglAhfp14L1VPDPRUlsuB+JZVK+Q53rLqMadZZZ2oZXXQi4k/3st+bRu1RCyAkKQ2HrNrIcdGfRKm5zwd8XZmOXkT [snail]:4422,[snail.dev.bitmask.i]:4422,[snail.dev.bitmask.net]:4422,[176.53.69.14]:4422 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDeKnuGyHXKeZKFG7HgOnLR6foMJ3ReD46tCTnsxYlad+gDIhpzWC0luxIrguQA3/aCSkHLw8FGCQQtJ7JR2fEYHcmYXf8PSMqm6uspMoiPYA7HeDv/3h/uoEeiBbczvlGBclJ5tISfjNqOyvJqLFGN6xa9T0WvV+CGVwn/zIw3T2uL30+gwNrmvSrE8vNJIR6aVjE7Rc8TdvV+vFcbhB+H5HFWWo7MKVtfma8ffsF47FLzQKP71zcyqgexcDs/Xx+Rh5rv4aNaDJ0IZwDW/faC3Iywvv57efBJpqJJcEqHaNrakvwXf6baQQU7P6j6UbgvoA/OcCI2Ldbf+WozMULx snake,snake.bitmask.i,snake.bitmask.net,199.119.112.22 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKbMHvg8E/L/xYUXCnnIFEeZmS8+7cjfbkQrEuyGdzkTjTxW7v/7AnEmN/mcWyzR8qGrsF16M+tWagZ8EAQV8j4= |