Merge branch 'master' of ssh://leap.se/bitmask

5 files changed, 8 insertions, 8 deletions

diff --git a/provider/files/nodes/ca1_vagrant/ca1_vagrant_ssh.pub b/provider/files/nodes/ca1_vagrant/ca1_vagrant_ssh.pub
index 59d2da0..1188e5e 100644
--- a/provider/files/nodes/ca1_vagrant/ca1_vagrant_ssh.pub
+++ b/provider/files/nodes/ca1_vagrant/ca1_vagrant_ssh.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCgLuvjtm2bVB7Q1vNSthCNkQlVZB4HoOcXBxmFHsz6CX4TuUXlSdkfSoD4h51rRpR74OO7CiXRpBxlMCgbnZia4gT6Bo2DzXHNUbaG5zeAR8olAE0w2+Co8Ny+uP6lOSnJEuMzV7B98ASYRsXCiDZ7hPcJQ3025HUXt4M/BDAnw0fisfUu0ihY9ghAnWGqfQbbTY3Xoeo0Jzx7AJ/KUvwgkMg/j9D5Mz4/C8SniIhOBI8n+uvmwW/O1DO2MGD71j+cMWEforGD76Gbqs0inLhvUJIkMZCfLUcVrtZQs6srLT5zyqXxqSZC9vWkRT5D1kgeNeC4gzDf0v3hVCuQME8f
\ No newline at end of file
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
\ No newline at end of file
diff --git a/provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant_ssh.pub b/provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant_ssh.pub
index 59d2da0..1188e5e 100644
--- a/provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant_ssh.pub
+++ b/provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant_ssh.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCgLuvjtm2bVB7Q1vNSthCNkQlVZB4HoOcXBxmFHsz6CX4TuUXlSdkfSoD4h51rRpR74OO7CiXRpBxlMCgbnZia4gT6Bo2DzXHNUbaG5zeAR8olAE0w2+Co8Ny+uP6lOSnJEuMzV7B98ASYRsXCiDZ7hPcJQ3025HUXt4M/BDAnw0fisfUu0ihY9ghAnWGqfQbbTY3Xoeo0Jzx7AJ/KUvwgkMg/j9D5Mz4/C8SniIhOBI8n+uvmwW/O1DO2MGD71j+cMWEforGD76Gbqs0inLhvUJIkMZCfLUcVrtZQs6srLT5zyqXxqSZC9vWkRT5D1kgeNeC4gzDf0v3hVCuQME8f
\ No newline at end of file
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
\ No newline at end of file
diff --git a/provider/files/nodes/vpn1_vagrant/vpn1_vagrant_ssh.pub b/provider/files/nodes/vpn1_vagrant/vpn1_vagrant_ssh.pub
index 59d2da0..1188e5e 100644
--- a/provider/files/nodes/vpn1_vagrant/vpn1_vagrant_ssh.pub
+++ b/provider/files/nodes/vpn1_vagrant/vpn1_vagrant_ssh.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCgLuvjtm2bVB7Q1vNSthCNkQlVZB4HoOcXBxmFHsz6CX4TuUXlSdkfSoD4h51rRpR74OO7CiXRpBxlMCgbnZia4gT6Bo2DzXHNUbaG5zeAR8olAE0w2+Co8Ny+uP6lOSnJEuMzV7B98ASYRsXCiDZ7hPcJQ3025HUXt4M/BDAnw0fisfUu0ihY9ghAnWGqfQbbTY3Xoeo0Jzx7AJ/KUvwgkMg/j9D5Mz4/C8SniIhOBI8n+uvmwW/O1DO2MGD71j+cMWEforGD76Gbqs0inLhvUJIkMZCfLUcVrtZQs6srLT5zyqXxqSZC9vWkRT5D1kgeNeC4gzDf0v3hVCuQME8f
\ No newline at end of file
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
\ No newline at end of file
diff --git a/provider/files/nodes/web1_vagrant/web1_vagrant_ssh.pub b/provider/files/nodes/web1_vagrant/web1_vagrant_ssh.pub
index 59d2da0..1188e5e 100644
--- a/provider/files/nodes/web1_vagrant/web1_vagrant_ssh.pub
+++ b/provider/files/nodes/web1_vagrant/web1_vagrant_ssh.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCgLuvjtm2bVB7Q1vNSthCNkQlVZB4HoOcXBxmFHsz6CX4TuUXlSdkfSoD4h51rRpR74OO7CiXRpBxlMCgbnZia4gT6Bo2DzXHNUbaG5zeAR8olAE0w2+Co8Ny+uP6lOSnJEuMzV7B98ASYRsXCiDZ7hPcJQ3025HUXt4M/BDAnw0fisfUu0ihY9ghAnWGqfQbbTY3Xoeo0Jzx7AJ/KUvwgkMg/j9D5Mz4/C8SniIhOBI8n+uvmwW/O1DO2MGD71j+cMWEforGD76Gbqs0inLhvUJIkMZCfLUcVrtZQs6srLT5zyqXxqSZC9vWkRT5D1kgeNeC4gzDf0v3hVCuQME8f
\ No newline at end of file
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
\ No newline at end of file
diff --git a/provider/files/ssh/known_hosts b/provider/files/ssh/known_hosts
index d90e74d..6575892 100644
--- a/provider/files/ssh/known_hosts
+++ b/provider/files/ssh/known_hosts
@@ -1,8 +1,8 @@
 aligator,aligator.bitmask.i,aligator.bitmask.net,176.53.69.120 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfbN1Tcf01Uu6pGIzTh7E/BVKDoO1sen85cWTcZMmm058YA9n+mPP4hI24//ZW/zpGNI4d7YKtKt6r3ao9dUhbkSWnnKRgMD1MFyq/GN7EnKwR2oWaGOPZ1Lllg6nPcMktCdUStm8Y7GPTw6SYpm7cH/lUd+6fozCLS9ZnujWNYnkYTMX5bN9SKVmYy/+P36M/P9oa5HqRUZDfMtj6ottkXYnTLtWlabbn98l2wgxKy6AHJJvdp3LVbln5G7vR/P21zhR178G2XdMTeCmMRF3H3/Y2Eiai6ArnylQre3s9UTUB3+uBEtI4zBbZNcbzzDpbZyHxue+12zzNYRV++pCv
-ca1_vagrant,ca1_vagrant.bitmask.i,ca1_vagrant.bitmask.net,10.5.5.48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCgLuvjtm2bVB7Q1vNSthCNkQlVZB4HoOcXBxmFHsz6CX4TuUXlSdkfSoD4h51rRpR74OO7CiXRpBxlMCgbnZia4gT6Bo2DzXHNUbaG5zeAR8olAE0w2+Co8Ny+uP6lOSnJEuMzV7B98ASYRsXCiDZ7hPcJQ3025HUXt4M/BDAnw0fisfUu0ihY9ghAnWGqfQbbTY3Xoeo0Jzx7AJ/KUvwgkMg/j9D5Mz4/C8SniIhOBI8n+uvmwW/O1DO2MGD71j+cMWEforGD76Gbqs0inLhvUJIkMZCfLUcVrtZQs6srLT5zyqXxqSZC9vWkRT5D1kgeNeC4gzDf0v3hVCuQME8f
-couchdb1_vagrant,couchdb1_vagrant.bitmask.i,couchdb1_vagrant.bitmask.net,10.5.5.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCgLuvjtm2bVB7Q1vNSthCNkQlVZB4HoOcXBxmFHsz6CX4TuUXlSdkfSoD4h51rRpR74OO7CiXRpBxlMCgbnZia4gT6Bo2DzXHNUbaG5zeAR8olAE0w2+Co8Ny+uP6lOSnJEuMzV7B98ASYRsXCiDZ7hPcJQ3025HUXt4M/BDAnw0fisfUu0ihY9ghAnWGqfQbbTY3Xoeo0Jzx7AJ/KUvwgkMg/j9D5Mz4/C8SniIhOBI8n+uvmwW/O1DO2MGD71j+cMWEforGD76Gbqs0inLhvUJIkMZCfLUcVrtZQs6srLT5zyqXxqSZC9vWkRT5D1kgeNeC4gzDf0v3hVCuQME8f
+ca1_vagrant,ca1_vagrant.bitmask.i,ca1_vagrant.bitmask.net,10.5.5.48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+couchdb1_vagrant,couchdb1_vagrant.bitmask.i,couchdb1_vagrant.bitmask.net,10.5.5.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
 koala,koala.bitmask.i,koala.bitmask.net,176.53.69.125 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+F/OOIZbQbK7/n6nnijHkYs2qjZzqYXyXUSyIDdA8GOg2g4p89YRvbLSkZ9BLl5x4zgyT3nIw6bee5ADErT266VKcvcYdKzMQ6ws+ZcV5Pa3jL3cmzsIossZBGnP8Q+MmjKP+2uFH0NXkAIABy8Wack/FHuIPWdcBrW61q6FX6788NEmYU2sQHble/K2rg1a5aLZm0HStsJhJL0y13jcw5NhhMVcGREqga6MgQ6iAOJYjbJBQnramOqpPavkUSyvgI68GZqevrFzgCkUCiv9cmIAnZEvOo0MIwmWQlUldHIi6lr9vRt9aqmAq0zuUlpxYk3zL9Q2EiaScgEE1XIkX
 sloth,sloth.bitmask.i,sloth.bitmask.net,176.53.69.122 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTZd7IQRQ0cryvj/7cif4PNOlsLjgcfFmCT0o477MOkds5bI4XVBfqjhtMpgEg92uIBrlU/zB0wHpviS6XLryF2CYODJDk+oHOPcoc+3uox5L9ODJRnWVl/LgBPSSPCw7XwTfrDIReBQ2E60ngpgekEjcZM6Qq4Z6jeG8A74sdviQCqVZ+hiVF0CVkRrmtMi7ucb48+5VxYNVkoc/b5GvkDNgPxCoddUhdRPXFr/tOWK77/3I5lsO+OnNd4ptbszmI3Uzidb02LGWU7CHIrSgBj8uAVyU8dtNV+L+quzlMxr13GBeTuYiu89/OjU9D9eoG5GBA5YRYY//BBpzd/F6B
 turtle,turtle.bitmask.i,turtle.bitmask.net,176.53.69.119 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDECAk6ImmnzRsorqoeU7kCpMClhLu80q5AJw1cfZlZMx4PEq0tMnRu2Q0jtGSQwBqU2OzUK+WXljx+5mF/mnJXtAO+/+usQFFzYiovT/7cjEAtYzlcECkqF0TajEIdCcqPoO0GJHpbhenlCfhnan9d3uJWIghI0DioNgeF+Prxw2eqA9UnyeJ+EefWMeo5e6DPjYohFTy/Jg4wpMqbFh/IfKqtp2/6fuz1ssaajePiAt4dVtzCttc8t68oJWr9scnDdlqyr4i7hQSizZiSRCgVwu94WCx2DJsMaxNUY7J9VzgR7T4ja/8TjnHLVMO+dd36A4F0yXVSo7WBZ0AqEsA9
-vpn1_vagrant,vpn1_vagrant.bitmask.i,vpn1_vagrant.bitmask.net,10.5.5.45 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCgLuvjtm2bVB7Q1vNSthCNkQlVZB4HoOcXBxmFHsz6CX4TuUXlSdkfSoD4h51rRpR74OO7CiXRpBxlMCgbnZia4gT6Bo2DzXHNUbaG5zeAR8olAE0w2+Co8Ny+uP6lOSnJEuMzV7B98ASYRsXCiDZ7hPcJQ3025HUXt4M/BDAnw0fisfUu0ihY9ghAnWGqfQbbTY3Xoeo0Jzx7AJ/KUvwgkMg/j9D5Mz4/C8SniIhOBI8n+uvmwW/O1DO2MGD71j+cMWEforGD76Gbqs0inLhvUJIkMZCfLUcVrtZQs6srLT5zyqXxqSZC9vWkRT5D1kgeNeC4gzDf0v3hVCuQME8f
-web1_vagrant,web1_vagrant.bitmask.i,web1_vagrant.bitmask.net,10.5.5.47 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCgLuvjtm2bVB7Q1vNSthCNkQlVZB4HoOcXBxmFHsz6CX4TuUXlSdkfSoD4h51rRpR74OO7CiXRpBxlMCgbnZia4gT6Bo2DzXHNUbaG5zeAR8olAE0w2+Co8Ny+uP6lOSnJEuMzV7B98ASYRsXCiDZ7hPcJQ3025HUXt4M/BDAnw0fisfUu0ihY9ghAnWGqfQbbTY3Xoeo0Jzx7AJ/KUvwgkMg/j9D5Mz4/C8SniIhOBI8n+uvmwW/O1DO2MGD71j+cMWEforGD76Gbqs0inLhvUJIkMZCfLUcVrtZQs6srLT5zyqXxqSZC9vWkRT5D1kgeNeC4gzDf0v3hVCuQME8f
+vpn1_vagrant,vpn1_vagrant.bitmask.i,vpn1_vagrant.bitmask.net,10.5.5.45 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+web1_vagrant,web1_vagrant.bitmask.i,web1_vagrant.bitmask.net,10.5.5.47 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9