added thrips, removed worm (#3697)

6 files changed, 66 insertions, 2 deletions

diff --git a/files/nodes/thrips/thrips.crt b/files/nodes/thrips/thrips.crt
new file mode 100644
index 0000000..2b9d7c1
--- /dev/null
+++ b/files/nodes/thrips/thrips.crt
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEpDCCAoygAwIBAgIRAJFRwA97gvgwDfSbOibAB6kwDQYJKoZIhvcNAQELBQAw
+SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
+GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTEzMDkwMzAwMDAwMFoXDTE0
+MDkwMzAwMDAwMFowHTEbMBkGA1UEAwwSdGhyaXBzLmJpdG1hc2submV0MIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoS3OEkLMBHd/evCTNRB1KmO+aw8Y
+fmnuW1USwTpx4jU7tOylHAXUvjx4pllVWkPiQkId1eDpJs+S1PUhup9qmer9/8GC
+SVNp3c4ka2qzxPkoooFU24ULK9RZi8upkBzFeKtBI3GwOZXqfAjq5u/T7GsZLsUu
+UIzGNa0hcpg4W3gaXfcYdJIRLXdJk56K+GaKMqC7dNLTCyGiGJ0u+r3++KTeDx+T
+MsgYEI6V6MDxclxmE1v25+TA6vR86tOE01EgYXmSUZ/BEoZBWIvp387JJAvN3duy
+rheaveISezbav3YD79rsBdJbYCkK9IWpVmlCDNEzjJ2cqHTkhdQAIOgwWQIDAQAB
+o4GxMIGuMB0GA1UdDgQWBBTXX2aJgLxi/DuXK0vnWLmJA4QknTA1BgNVHREELjAs
+ghB0aHJpcHMuYml0bWFzay5pghJ0aHJpcHMuYml0bWFzay5uZXSHBMwNpKIwCwYD
+VR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAJBgNVHRME
+AjAAMB8GA1UdIwQYMBaAFLmBgyy9rLMJ2KRx7z66LdSVPg+PMA0GCSqGSIb3DQEB
+CwUAA4ICAQCg0lze2wap4s+AZBR1zACdA1QqsBxuHtrdUBSGOTpcaAHSXtSj9imE
+p3LHBtKxOqbHRZjjSLdGasxwb2Zps7EQfKnxQeJoFZuVzG4dxogRupeESP1HDZaw
+sqTDQR85S8DpZp9umwbINEbLbpF1j8O3C/aUTPAA/5TEktK4ldQz9/am1pwVksvK
+WAlAdQOrjAzRO5N2YQ932MIOh0FGRppJbf1mlT3ziw7sihkNxmY8ua6fJqIKFtgC
+K0LDskvCN4FgY1GW6ZPX5/KIpxkrXYQ7IetmpK6EShHDavvlBgvKh6e7v3IAhMXk
+cRnkJnUr4Qof+2bfoNMSiMBnZ9i69uFYPBVQ+y+mhmHKY9fYxOXCpMQIKCt+q5Xw
+bkNJNgGp6di4/XvscWQtPSt4toW+Elp0HdSMVRx1MIf6+VvXI55Pj/ObQwRUatG6
+UDNH0xhJXNUm7Rg+J6WNy8AiuFqf4jym+0OfsjWtmsSDeiHsVTm0K8wOMpdleNgz
+mWlD7tJXLG5rUjM2HagZuYU05SSs96a+sG/eojOu65Kxts1sXQ0Vr+5RCuXQeYsO
+DbdSMz/cwTCeQeY8P0XjmEVazCGV1MPOj12pQqkuvexhUdGQ+5VTG4c4LvJupQfl
+lxMJf6UdMl6eiTgKaWY0iiY40vSf4Dj+Pi3I4n1kWSypTOSL/9Ii4A==
+-----END CERTIFICATE-----
diff --git a/files/nodes/thrips/thrips.key b/files/nodes/thrips/thrips.key
new file mode 100644
index 0000000..1180ba6
--- /dev/null
+++ b/files/nodes/thrips/thrips.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAoS3OEkLMBHd/evCTNRB1KmO+aw8YfmnuW1USwTpx4jU7tOyl
+HAXUvjx4pllVWkPiQkId1eDpJs+S1PUhup9qmer9/8GCSVNp3c4ka2qzxPkoooFU
+24ULK9RZi8upkBzFeKtBI3GwOZXqfAjq5u/T7GsZLsUuUIzGNa0hcpg4W3gaXfcY
+dJIRLXdJk56K+GaKMqC7dNLTCyGiGJ0u+r3++KTeDx+TMsgYEI6V6MDxclxmE1v2
+5+TA6vR86tOE01EgYXmSUZ/BEoZBWIvp387JJAvN3duyrheaveISezbav3YD79rs
+BdJbYCkK9IWpVmlCDNEzjJ2cqHTkhdQAIOgwWQIDAQABAoIBAQCR8DOCfVDVSo32
+9xWTGo+8DgxAS67V53yW3fTZWN39AE5Lh2oIcY8roP1tQb3yuTyI2ezB15/EMHa2
+tC4SGH4hV5Ecnk4lro1Q9HItgLO9Sgzs90WqblCrIt7hoUqq3iI/HHEicrIpsgBa
+xohLCiRNELwAiTFiZdSijVyXshR1XF3FVHHE4T+3L21BUZIhvyf1muSzmNfTSc95
+Jeej76jPkdqu5qFWElUDLpwNLEnc51Oy30b3LJiWxGacNJSVWYlDPYguDlN8o5R8
+LVmXdFg3E6TEyPslmiZt8YM4FYpjO5CWIEYDxwOREFAxzDZMSZqUz2ccpyeTHH4v
+5ApsI8HBAoGBANYvvVXWHpwxHoUNsWfgMxSG3GOBZEzy0BDWN2U6k7IBQ0o73cG3
+J1Uu4ERNc1QN7uIIPKthrCfKmIL5SQz5c8uHMUhZY0/8e1HumVxlf2iO4z5MD78J
+EyyLcB5k2f3yDjvlKuOEgq3MWrkaIXxPrOEaWu/vpSKK+2DJcwyeEP5NAoGBAMCk
+8NIpTQqdZ76RApJvs/7xa0pF5NHMc7ktmPwUcu4Tg9bPyGr58mfY2OTSm9e2zh1x
+swCsHkQJk5IgOSKLPCCYv1gNgKZlVx4lPdFcf/A+0yi8e0/9fFh87KRfbGZij+Li
+s1z1SaQe14vpfS4cfyhV3jewTiv3za+m5uutBfg9AoGARC8YZ/3s6q4cWCD+y+Gs
+gSlZeXfUdUaLBAEdy2T1ZaJPSI98TdG/fLeaf0Pkpep1lJEotyo1wskU+gTfw3iZ
+6z3Ta4PBQNJQc8mwGqDZCXELWGagUKFT8EdHXvWeC+CFtX2DxMAHVcqLSwfNhyRa
+FaLtNhqlCDUUR0B6FpcvM7UCgYEAlW5cL2lCDX3Tv4qUSCrFoHh8FPzqZaMGERpB
+lSf3jp0sozBB8lk3oz4d4EFOCaIPd99+ToM0ZupWwf6k0xrV5SMXKaIvrOLnFMcm
+kIQD6cOR4AN0U7P5BFrC5S3v0+uYWRIot269VMVnxWu0YlRQfmU9Hk1wFcL+lcYN
+UbrA6rECgYA6zy4S3lN08USm8aLBAYUWI976auXSei27XQ91ugR+LhFjSNQygfzF
+WjOlx2OVoo25JTBEHH81v8ctgf9bW+ujWvj/zjpMYlES0b9g/8qFAWjzPNXOQO63
+SMdTB7lfk+6u5Zii+eLm9AETldA8KYCV9Crmg87j4ntpqIv/oSzyzA==
+-----END RSA PRIVATE KEY-----
diff --git a/files/nodes/thrips/thrips_ssh.pub b/files/nodes/thrips/thrips_ssh.pub
new file mode 100644
index 0000000..b302036
--- /dev/null
+++ b/files/nodes/thrips/thrips_ssh.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIJHNnsfeuNBkVRm7cJvgD0rTX1wztnoz9SuHK2vJ9Pcluo8VfFoQrwayoFiAPJNC0dOoSra0Ir9L/eNQtjEzW0=
\ No newline at end of file
diff --git a/files/ssh/known_hosts b/files/ssh/known_hosts
index 169f965..5b036b9 100644
--- a/files/ssh/known_hosts
+++ b/files/ssh/known_hosts
@@ -16,6 +16,6 @@ leech,leech.bitmask.i,leech.bitmask.net,198.252.153.85 ecdsa-sha2-nistp256 AAAAE
 millipede,millipede.bitmask.i,millipede.bitmask.net,198.252.153.83 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBG02MrdDFaqZO11JbYSAAC5q/W/FCch3AQXo+dRcpErvHLmv9kWkrV1ESqfZ+s6qEfk8Aqv0vsym7YigMiGXlBo=
 snail,snail.dev.bitmask.i,snail.dev.bitmask.net,176.53.69.14 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDeKnuGyHXKeZKFG7HgOnLR6foMJ3ReD46tCTnsxYlad+gDIhpzWC0luxIrguQA3/aCSkHLw8FGCQQtJ7JR2fEYHcmYXf8PSMqm6uspMoiPYA7HeDv/3h/uoEeiBbczvlGBclJ5tISfjNqOyvJqLFGN6xa9T0WvV+CGVwn/zIw3T2uL30+gwNrmvSrE8vNJIR6aVjE7Rc8TdvV+vFcbhB+H5HFWWo7MKVtfma8ffsF47FLzQKP71zcyqgexcDs/Xx+Rh5rv4aNaDJ0IZwDW/faC3Iywvv57efBJpqJJcEqHaNrakvwXf6baQQU7P6j6UbgvoA/OcCI2Ldbf+WozMULx
 starfish,starfish.dev.bitmask.i,starfish.dev.bitmask.net,176.53.69.23 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+Gp9NNBB/2N2rCZm9MBlnJmpRnWVXG5mAuv9fACnHcA/1VtwszPxO2V4SHIWITwibAi+zPM9T4rDzPFSvy0AvLCrV1MdEWhv5ojURIpbv//pUIz9kueSoUM15IsCNMZ3ypvHUrnJa36Usn1Dyf8zTBp7/Fmhm9Imny9ewbOJX8kTgGsjlsahVisltslREXKbLrl6smT/veUHDRAyen37P1WJiE90fx/awPFCoRaQ8Q2Gjw3hAbS/whmP2GtSG3OK6imPpj9imLT5MpYiLxSATQF3e/Fu5AWldUkpPOFzaadMEQ/oPsRFVEMSEw69Ev1BfNKSgnaeQJ1IqZvHrrr6z
+thrips,thrips.bitmask.i,thrips.bitmask.net,204.13.164.162 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIJHNnsfeuNBkVRm7cJvgD0rTX1wztnoz9SuHK2vJ9Pcluo8VfFoQrwayoFiAPJNC0dOoSra0Ir9L/eNQtjEzW0=
 urchin,urchin.dev.bitmask.i,urchin.dev.bitmask.net,176.53.69.21 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDM17G1+HlD7RkyiOXWzsllv2fSVxdRDNolonBflcgZv5o1FdMUftkmkkO3qKKtns570DZ6NN0PrqFqGT+F9cuPot3ipqJz2jkaXLz/MB8t5Eh6gygIuNfi3qd3aVYl43r0lSLjPI2Yn9dbUhTcdMUPvdRT7lC0MyzkuzMzr+XIJZGDGxkZ5d+zvrbz8j2Z6+iWubYbjmDoeQfr7yebClVmlhFgVcIsBGK7B4g2YEjOV2vY0Art+mhToRdJl53kHQU+T6wC1MClW9m3tHAn51zX52kBFrsBlpTHZwhLX91NDV+lR0/+/h6+9mf1S7Mnyq80mfvz1MKtHwp1xgYvKsPh
 wallaby,wallaby.bitmask.i,wallaby.bitmask.net,204.13.164.57 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP/bJJ5OoSveoTEXAl26Gz0tqJkwzdA2fezMFeyoDDF6BCWntfzFZahoxHWg5alUfNMCJeYYOPYu/k05QzXThkQ=
-worm,worm.bitmask.i,worm.bitmask.net,202.85.227.194 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPQH3N33E2ajHnLUbNXlG5I+yizT0rDGEiZ3gdVDyxRXaMLkzPqhY7ZsZx1b0iEs+s8iw5Vf6FAV6ukVrZrsb6w=
diff --git a/nodes/thrips.json b/nodes/thrips.json
new file mode 100644
index 0000000..e5ac68d
--- /dev/null
+++ b/nodes/thrips.json
@@ -0,0 +1,8 @@
+{
+  "ip_address": "204.13.164.162",
+  "services": [
+    "couchdb",
+    "soledad"
+  ],
+  "tags": ["production", "seattle"]
+}
diff --git a/nodes/worm.json b/nodes/worm.json
index 7ad3ec2..edb6b7a 100644
--- a/nodes/worm.json
+++ b/nodes/worm.json
@@ -4,5 +4,6 @@
     "couchdb",
     "soledad"
   ],
-  "tags": ["production", "hongkong"]
+  "tags": ["production", "hongkong"],
+  "enabled": false
 }