Merge branch 'develop'

Conflicts:
	Leapfile
	files/ssh/authorized_keys

3 files changed, 58 insertions, 0 deletions

diff --git a/files/nodes/canvasback/canvasback.crt b/files/nodes/canvasback/canvasback.crt
new file mode 100644
index 0000000..ea06b69
--- /dev/null
+++ b/files/nodes/canvasback/canvasback.crt
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFHjCCAwagAwIBAgIQQIPf6cTnDIf9vRvEBgjm3TANBgkqhkiG9w0BAQsFADBK
+MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
+BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTMwNzEwMDAwMDAwWhcNMTQw
+NzEwMDAwMDAwWjAmMSQwIgYDVQQDDBtjYW52YXNiYWNrLmNkZXYuYml0bWFzay5u
+ZXQwggEeMA0GCSqGSIb3DQEBAQUAA4IBCwAwggEGAoH+ALGLmVKSWmQhM13dhazD
+VQurqvMvXqC7lUsatwcurrXw7mMcXTtu0ENF69nbZlwtSiDqLJHqa0ZPeM11+zF2
+pDaEdBgjRTuozcNTaqo3v7tYuJHwIFcaRJe0fYRZi1Qy2NiIhakP1gCujkUDBwf4
+ttoPYa5EGPYyNtDQCHF9uVbEoVSxBe6Qk39nudeCe3ixEqSn2AFseLzdUotNHf6P
+x21OGe0WPiJSww1SSXj3Y7Rul1Dp/80633mQ2gIbQtUf4SsvWhfw94M+BC98aqfD
+UubVw7DEjDV4Ar0It5jKQxiuh9r8pDe+FCrZqX3VYe6EccKT8llsVQFck7OpsfcC
+AwEAAaOCASYwggEiMB0GA1UdDgQWBBTU8VtOYppAgZl2Miin6VaRBMyLTzCBqAYD
+VR0RBIGgMIGdghljYW52YXNiYWNrLmNkZXYuYml0bWFzay5pghtjYW52YXNiYWNr
+LmNkZXYuYml0bWFzay5uZXSCEGNkZXYuYml0bWFzay5uZXSCG2NhbnZhc2JhY2su
+Y2Rldi5iaXRtYXNrLm5ldIIUYXBpLmNkZXYuYml0bWFzay5uZXSCGG5pY2tueW0u
+Y2Rldi5iaXRtYXNrLm5ldIcEx3dwBDALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwEGCCsGAQUFBwMCMAkGA1UdEwQCMAAwHwYDVR0jBBgwFoAUuYGDLL2s
+swnYpHHvProt1JU+D48wDQYJKoZIhvcNAQELBQADggIBAEdW+bXCXmbfhE9Z/n3r
+EhFLJlx9yT5UtEOTL+iQpQHaNoON77pkgwpU9Wse15YE8KO+ap9F5554KaRMbVSd
+hqeMZXUrbWRB6HEP1SyNUEwTMVZeiGQnyBaDzWhvxE3wz+hs20+ECJTOx1YaIP83
+B+0PbYPzoJGiXC4KmL2T4yttKSbPgCiCHkDw3XwV6UWPlsXJ40VPoK0MCD9uiEiW
+EHxICXrXvE38pwYxmlcIRJ7r9YzJtXhnZ/N/meykjVWjt70P60vg1ck8djvbcwRo
+2YSU0rh8km0+rei1EiHOmp2fHdwaJu0L+IC3ZHBA72UbeNSDlx4rvBi7A68TWxy8
+yebGW1cUJrXhCEqNUvfVnLXuM0khnC0S6Ggt9pf6GovmPh9ZwPI95P6YcLUHL6Rw
+yyuDrNS8aoJ3o/hkVmMSSUOc56V/EKMsIqmZ7I/PjC0SXgEkpXt4acmy/elh9gXL
+UbTpIygpeJvnhYtgmsgFd7wKvg8xleCKx4ERYENmcUPdz7Lzqs6fQIE7lqz3DRo8
+Wp0Noscldr7fxNJMhdjN1QiErRbL8SpD2yYR3Dmu6Bf/nYWHesV2sacXjRfi0i+Z
+ZkT7wpxe/B5xP3i4551UMAU2J6LxSNXmojd7HNnZCoIGD8WWjhAagSAx+WbKLV/P
+THQQcYjiOwVMkFTfovihPdvq
+-----END CERTIFICATE-----
diff --git a/files/nodes/canvasback/canvasback.key b/files/nodes/canvasback/canvasback.key
new file mode 100644
index 0000000..dbcc18f
--- /dev/null
+++ b/files/nodes/canvasback/canvasback.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEjgIBAAKB/gCxi5lSklpkITNd3YWsw1ULq6rzL16gu5VLGrcHLq618O5jHF07
+btBDRevZ22ZcLUog6iyR6mtGT3jNdfsxdqQ2hHQYI0U7qM3DU2qqN7+7WLiR8CBX
+GkSXtH2EWYtUMtjYiIWpD9YAro5FAwcH+LbaD2GuRBj2MjbQ0AhxfblWxKFUsQXu
+kJN/Z7nXgnt4sRKkp9gBbHi83VKLTR3+j8dtThntFj4iUsMNUkl492O0bpdQ6f/N
+Ot95kNoCG0LVH+ErL1oX8PeDPgQvfGqnw1Lm1cOwxIw1eAK9CLeYykMYrofa/KQ3
+vhQq2al91WHuhHHCk/JZbFUBXJOzqbH3AgMBAAECgf1EO9VyEYMhxky6f19XdT6j
+HJe3nHXuqgkHcz3ySbOlgvHrL0R5ie4KXL323UYqmNFLcxQsA/60Z+iSdgxTBzi3
+JxKDEFMUSZzCu7Vbs89BDijpFXMoZpUEBL7UdaGBe4UxOs67mbVyT6OnzDEQlDqZ
+9Z1h3xQE0mmUuM715w6glylRXAWTe4lxb9K1lJ4zSg03iPQFxX3TeSCGsHituaCk
+DxU7HGepG8GXdfEq5t4TsfBgqaqY21/7rT3GfvYqogqVJ0PaxbR+G4vgqHVIwbvv
+L6JLfoUoDCzsjMKGcBjzLBjF03OlZSYE6fbzCUKQ6VUFhF6mn7Fu/eQJ9I1ZAn8N
+ck/y8v9Ash4y5tX+ruoOVJvfptaelLd5bziVYYW8LYO9+AdCQ5/UmvfQgzq8XVu9
+FX71cOjD73AYZFpgqlZrcdxlwh1pJFVuQjVNgVczIg1c4M50pVCVI84rvHqhQdfQ
+GMcwxnqFSuLIvVkeA5SPiJrfdhHKoOwP9qbQ/wU1An8NNCwn8kzQzSjtUK5J9VMm
+4+IyYHCAX8NeIZ4Vf/HC4kQIno828mx8F4gKkrKPrTNZuZdXArUhsEDOx6MIz7dU
+m5Q5OfWv5DDGoRB4AfzzSxBfOMRgFYJxbdGfw6ybItODKNNrD36MJ3otTxWbL2gD
+nu5jR8qswSTL9f/VJxv7An8JA0DRL8yk+X5CUfTHY0ggWNetfa9G1ZlwvHqprZcs
+/TjbYN7ErHz5zPEjgoIg9VZjE4BoVMi/Y8K3prPpLOMF22iFkCmUarUUVS5TB8mB
+zWY1hbz79D5h6IDtUcTER1S295SzfaVrqDj/oeKUuoOd/UsJUqM0NM5lGMbROM2t
+An8GZyeGk5ymoObY9ogee2ZAdMALV/MWfdn6+uhzWqE9tYXyfBnNNpBfOPYS0oLe
+48oEF9kJK9n0pUk4PV2Vd01bLTsa6T14d3sjx5V57NTikqM02g143tVr9ipyhGxe
+quvRLeogf9oJU1ePQ0uh/sI9B0RpRrZFQkB63CedESMjAn8Mr1/TIAoV55qRyG5J
+Vpbqwq9NSLVkx1ObI8gHMLgFP0rpHE6x+gQsa2pl/cJZGJ3B4BTGJFQ7mcL7zxgT
+f6Wr/Uka36TrJeA7HUm8gxwo3V/DgGepUyARqdwSfZJfrEM55AfSb2nQmCG0Q9Df
+gG1gtax/ZKmqz6SWj06sPmq2
+-----END RSA PRIVATE KEY-----
diff --git a/files/nodes/canvasback/canvasback_ssh.pub b/files/nodes/canvasback/canvasback_ssh.pub
new file mode 100644
index 0000000..999b3c0
--- /dev/null
+++ b/files/nodes/canvasback/canvasback_ssh.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBH5g/h43gZ3pQsU8ohme4J2mDeZgxGnd3lfR428GRqxKH4MEDGGrimpK1oPf6scey+oD8WYvSYP3ZjPFZHxyq4A=
\ No newline at end of file