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

8 files changed, 11 insertions, 5 deletions

diff --git a/provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant_ssh.pub b/provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant_ssh.pub
new file mode 100644
index 0000000..76deebc
--- /dev/null
+++ b/provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant_ssh.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiROaZVwf91t5HrqN02so4zN3Te2boJ3dyuGxoNa2oPosmEEyAcsOKH5a4WqSX6zMYUVL+lA6Be4boZgAt8XC0YkbHaTKJiTqJ80AGb5h8YEhaPmvnGdHPjOBeeOgIlgmmvnUeeTv+DkGzJ5iXVTxkaEFOvZP7fI2M49MDSyuPO1gMj48WymCgWfCACnA6W1k+BDpIFSdpy3vLXjJnGYRFPV4ANgjbxd9utA6dWILZfpe74E+BfyYZU69sjLp5xJX5qVFwrnnn8A86V45QYIqLMCbQibsYkxL2WApp3vk8JvJ/zepLRn40PCG8oQYu2a2/aUpSRXo6114H6wEg38HD
\ 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
new file mode 100644
index 0000000..76deebc
--- /dev/null
+++ b/provider/files/nodes/vpn1_vagrant/vpn1_vagrant_ssh.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiROaZVwf91t5HrqN02so4zN3Te2boJ3dyuGxoNa2oPosmEEyAcsOKH5a4WqSX6zMYUVL+lA6Be4boZgAt8XC0YkbHaTKJiTqJ80AGb5h8YEhaPmvnGdHPjOBeeOgIlgmmvnUeeTv+DkGzJ5iXVTxkaEFOvZP7fI2M49MDSyuPO1gMj48WymCgWfCACnA6W1k+BDpIFSdpy3vLXjJnGYRFPV4ANgjbxd9utA6dWILZfpe74E+BfyYZU69sjLp5xJX5qVFwrnnn8A86V45QYIqLMCbQibsYkxL2WApp3vk8JvJ/zepLRn40PCG8oQYu2a2/aUpSRXo6114H6wEg38HD
\ 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
new file mode 100644
index 0000000..76deebc
--- /dev/null
+++ b/provider/files/nodes/web1_vagrant/web1_vagrant_ssh.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiROaZVwf91t5HrqN02so4zN3Te2boJ3dyuGxoNa2oPosmEEyAcsOKH5a4WqSX6zMYUVL+lA6Be4boZgAt8XC0YkbHaTKJiTqJ80AGb5h8YEhaPmvnGdHPjOBeeOgIlgmmvnUeeTv+DkGzJ5iXVTxkaEFOvZP7fI2M49MDSyuPO1gMj48WymCgWfCACnA6W1k+BDpIFSdpy3vLXjJnGYRFPV4ANgjbxd9utA6dWILZfpe74E+BfyYZU69sjLp5xJX5qVFwrnnn8A86V45QYIqLMCbQibsYkxL2WApp3vk8JvJ/zepLRn40PCG8oQYu2a2/aUpSRXo6114H6wEg38HD
\ No newline at end of file
diff --git a/provider/files/ssh/known_hosts b/provider/files/ssh/known_hosts
index 3ef8e56..2230bde 100644
--- a/provider/files/ssh/known_hosts
+++ b/provider/files/ssh/known_hosts
@@ -1,4 +1,7 @@
 ca1,ca1.bitmask.i,ca1.bitmask.net,176.53.69.125 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+F/OOIZbQbK7/n6nnijHkYs2qjZzqYXyXUSyIDdA8GOg2g4p89YRvbLSkZ9BLl5x4zgyT3nIw6bee5ADErT266VKcvcYdKzMQ6ws+ZcV5Pa3jL3cmzsIossZBGnP8Q+MmjKP+2uFH0NXkAIABy8Wack/FHuIPWdcBrW61q6FX6788NEmYU2sQHble/K2rg1a5aLZm0HStsJhJL0y13jcw5NhhMVcGREqga6MgQ6iAOJYjbJBQnramOqpPavkUSyvgI68GZqevrFzgCkUCiv9cmIAnZEvOo0MIwmWQlUldHIi6lr9vRt9aqmAq0zuUlpxYk3zL9Q2EiaScgEE1XIkX
 couch1,couch1.bitmask.i,couch1.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
+couchdb1_vagrant,couchdb1_vagrant.bitmask.i,couchdb1_vagrant.bitmask.net,10.5.5.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiROaZVwf91t5HrqN02so4zN3Te2boJ3dyuGxoNa2oPosmEEyAcsOKH5a4WqSX6zMYUVL+lA6Be4boZgAt8XC0YkbHaTKJiTqJ80AGb5h8YEhaPmvnGdHPjOBeeOgIlgmmvnUeeTv+DkGzJ5iXVTxkaEFOvZP7fI2M49MDSyuPO1gMj48WymCgWfCACnA6W1k+BDpIFSdpy3vLXjJnGYRFPV4ANgjbxd9utA6dWILZfpe74E+BfyYZU69sjLp5xJX5qVFwrnnn8A86V45QYIqLMCbQibsYkxL2WApp3vk8JvJ/zepLRn40PCG8oQYu2a2/aUpSRXo6114H6wEg38HD
 vpn1,vpn1.bitmask.i,vpn1.bitmask.net,176.53.69.120 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfbN1Tcf01Uu6pGIzTh7E/BVKDoO1sen85cWTcZMmm058YA9n+mPP4hI24//ZW/zpGNI4d7YKtKt6r3ao9dUhbkSWnnKRgMD1MFyq/GN7EnKwR2oWaGOPZ1Lllg6nPcMktCdUStm8Y7GPTw6SYpm7cH/lUd+6fozCLS9ZnujWNYnkYTMX5bN9SKVmYy/+P36M/P9oa5HqRUZDfMtj6ottkXYnTLtWlabbn98l2wgxKy6AHJJvdp3LVbln5G7vR/P21zhR178G2XdMTeCmMRF3H3/Y2Eiai6ArnylQre3s9UTUB3+uBEtI4zBbZNcbzzDpbZyHxue+12zzNYRV++pCv
+vpn1_vagrant,vpn1_vagrant.bitmask.i,vpn1_vagrant.bitmask.net,10.5.5.45 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiROaZVwf91t5HrqN02so4zN3Te2boJ3dyuGxoNa2oPosmEEyAcsOKH5a4WqSX6zMYUVL+lA6Be4boZgAt8XC0YkbHaTKJiTqJ80AGb5h8YEhaPmvnGdHPjOBeeOgIlgmmvnUeeTv+DkGzJ5iXVTxkaEFOvZP7fI2M49MDSyuPO1gMj48WymCgWfCACnA6W1k+BDpIFSdpy3vLXjJnGYRFPV4ANgjbxd9utA6dWILZfpe74E+BfyYZU69sjLp5xJX5qVFwrnnn8A86V45QYIqLMCbQibsYkxL2WApp3vk8JvJ/zepLRn40PCG8oQYu2a2/aUpSRXo6114H6wEg38HD
 web1,web1.bitmask.i,web1.bitmask.net,176.53.69.119 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsxN2K/I/pVbcU4nNsep9BsUzebFpldzntm6KBx+6OGgLEJnK0WObk0mqP29W2HveisF61hgpI+j7BX38VTiRIcPJEK1BoPONcrVX/bWARn+88PhFfoMJLa5rON5IFAahRUOkS4CnrAwsuvOZ4CzneW1P7cYitKrRNUXzKMHRcAd5alOyrSKLJ29JmIt7ojmYTnNYQYsvyqexI6pyfg4kIYFHzt0BIzNWMJb76PrTpteY4ZW35VHdB8AGLSI7iWxMtEyekhlvHJ2EoHfvps+BVTto7xxVFLDpjIdzxClGcQNvWB14NdYQ0ikRflYRMO6nvTGC31jij43oMp2cACUwD
+web1_vagrant,web1_vagrant.bitmask.i,web1_vagrant.bitmask.net,10.5.5.47 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiROaZVwf91t5HrqN02so4zN3Te2boJ3dyuGxoNa2oPosmEEyAcsOKH5a4WqSX6zMYUVL+lA6Be4boZgAt8XC0YkbHaTKJiTqJ80AGb5h8YEhaPmvnGdHPjOBeeOgIlgmmvnUeeTv+DkGzJ5iXVTxkaEFOvZP7fI2M49MDSyuPO1gMj48WymCgWfCACnA6W1k+BDpIFSdpy3vLXjJnGYRFPV4ANgjbxd9utA6dWILZfpe74E+BfyYZU69sjLp5xJX5qVFwrnnn8A86V45QYIqLMCbQibsYkxL2WApp3vk8JvJ/zepLRn40PCG8oQYu2a2/aUpSRXo6114H6wEg38HD
diff --git a/provider/nodes/couchdb1_vagrant.json b/provider/nodes/couchdb1_vagrant.json
index 87f4935..390767d 100644
--- a/provider/nodes/couchdb1_vagrant.json
+++ b/provider/nodes/couchdb1_vagrant.json
@@ -1,6 +1,5 @@
 {
   "services": "couchdb",
   "ip_address": "10.5.5.44",
-  "ssh": {
-    "port": 4422 }
+  "tags": ["vagrant"]
 }
diff --git a/provider/nodes/vpn1_vagrant.json b/provider/nodes/vpn1_vagrant.json
index 888b55c..33cccd0 100644
--- a/provider/nodes/vpn1_vagrant.json
+++ b/provider/nodes/vpn1_vagrant.json
@@ -1,10 +1,8 @@
 {
   "services": "openvpn",
+  "tags": ["vagrant"],
   "ip_address": "10.5.5.45",
   "interface": "eth0",
-  "ssh": {
-    "port": 4422 },
-  "tags": "production",
   "openvpn": {
     "gateway_address": "10.5.5.46",
     "filter_dns": true
diff --git a/provider/nodes/web1_vagrant.json b/provider/nodes/web1_vagrant.json
index 689ce62..4e80ba9 100644
--- a/provider/nodes/web1_vagrant.json
+++ b/provider/nodes/web1_vagrant.json
@@ -1,4 +1,5 @@
 {
   "services": "webapp",
+  "tags": ["vagrant"],
   "ip_address": "10.5.5.47"
 }
diff --git a/provider/tags/vagrant.json b/provider/tags/vagrant.json
new file mode 100644
index 0000000..2c63c08
--- /dev/null
+++ b/provider/tags/vagrant.json
@@ -0,0 +1,2 @@
+{
+}