added octopus, unstable.bitmask.net mx server

6 files changed, 69 insertions, 0 deletions

diff --git a/facts.json b/facts.json
index 6e66a7f..4f68413 100644
--- a/facts.json
+++ b/facts.json
@@ -15,6 +15,10 @@
     "ec2_local_ipv4": "192.168.4.2",
     "ec2_public_ipv4": "192.168.5.8"
   },
+  "octopus": {
+    "ec2_local_ipv4": "192.168.4.21",
+    "ec2_public_ipv4": "192.168.5.16"
+  },
   "panda": {
     "ec2_local_ipv4": "192.168.4.19",
     "ec2_public_ipv4": "192.168.5.9"
diff --git a/files/nodes/octopus/octopus.crt b/files/nodes/octopus/octopus.crt
new file mode 100644
index 0000000..7ba9532
--- /dev/null
+++ b/files/nodes/octopus/octopus.crt
@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE-----
+MIIEwjCCAqqgAwIBAgIRAIdWsv0isLwYNnRsUoTuBoYwDQYJKoZIhvcNAQELBQAw
+SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
+GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE0MDIxOTAwMDAwMFoXDTE1
+MDIxOTAwMDAwMFowJzElMCMGA1UEAwwcb2N0b3B1cy51bnN0YWJsZS5iaXRtYXNr
+Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANz1uFmT8iv4udnF
+Kmtzn2+a49I4q/AYIHVZv378mjE4TQOWSaiPHtTZJeU/C2CyP2zflvB6BBiq7jvg
+XpOUfmY09gn0gnsjjV4V2Y9ETPG11JwW3PMaUQyWrYAIBTts772s4SL9wwo0IKys
+zbbQIigT6GnPbQXACQElqKNYWfGLAfS15As2Nq5FnRPN8ymEe1WgRAsnjPFSf/WC
+BdZdoBnWQtalQQkfPGExsjnRYfZUWsJIjnW3XNYpQ3/PzSV3Ka0WS14h0e2+IACh
+PgwgJ6iVTyBL6cnbmbdyafYlRWYrC4STRkLIm97XOsh+sr4sEXt0IU6O8YX/PsrM
+ggYySfsCAwEAAaOBxTCBwjAdBgNVHQ4EFgQUVBYbuHgdt0EpTGJ+VXBgeciJQFsw
+SQYDVR0RBEIwQIIab2N0b3B1cy51bnN0YWJsZS5iaXRtYXNrLmmCHG9jdG9wdXMu
+dW5zdGFibGUuYml0bWFzay5uZXSHBMd3cBAwCwYDVR0PBAQDAgWgMB0GA1UdJQQW
+MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFLmB
+gyy9rLMJ2KRx7z66LdSVPg+PMA0GCSqGSIb3DQEBCwUAA4ICAQCqJ3BbtWslDeBN
+CIQmnXjn2ikvnViYKMa/cPw03wBpxlUkxl3YyXveQv3ICzgKOi4CqLsLPzUZi1bU
+sqqo59yuCmBWZ8p7Aw5o+KgngPMUOr9h9L8CfJjO+RuL+SjKck1oO/IACL6CD6cX
+AXfIjd3B6t4Rqd/JkUsJpneToPQO8PeEtxtw6cRpib67aQpZt/gxSYC3VpYk+SIh
+lWx7YN1QwoK+I0JmfAYidgok1s/fgv/1ditJZHs05fAS8mNnX8irknHVAOhLpU5d
+6dLQw+du8FLpNtDGRxkealDIjZsM1Led4AYPpxNhjaa8h2VOV6bIks6tNDQvPlCK
+5NmTOzhItg/8ld0Toyz99X/pedej4A0tYoIbakpYYXyB06Klkw+vLLF803mvAiDL
+NcHh+XmQRlx3U/hfOR+1h6fQRzBw1HnNemlBTIyREmSn7Sg7+13IpDPtu3GcTQCP
+41aojB6HANxJFDAPWjN3TdyRqzbrdR1VPVO1yCpLznDsWHYW4/9sJuSPEdapPRpe
+LFWG0npMn6Mbx7jyZllhY0LX4rN8tWBrdhvihZBlkWA4R+X13UlMJY+P/mcHQfOh
+PyFqEVyyD80IakOrI5Unk9N95Ecc8CYcvyLuULR+Hv63ZCEDAe72qGsVq0YTTC0C
+ep61HHthZTwunnarRJs0ihgcUyoPyA==
+-----END CERTIFICATE-----
diff --git a/files/nodes/octopus/octopus.key b/files/nodes/octopus/octopus.key
new file mode 100644
index 0000000..c9178d3
--- /dev/null
+++ b/files/nodes/octopus/octopus.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEA3PW4WZPyK/i52cUqa3Ofb5rj0jir8BggdVm/fvyaMThNA5ZJ
+qI8e1Nkl5T8LYLI/bN+W8HoEGKruO+Bek5R+ZjT2CfSCeyONXhXZj0RM8bXUnBbc
+8xpRDJatgAgFO2zvvazhIv3DCjQgrKzNttAiKBPoac9tBcAJASWoo1hZ8YsB9LXk
+CzY2rkWdE83zKYR7VaBECyeM8VJ/9YIF1l2gGdZC1qVBCR88YTGyOdFh9lRawkiO
+dbdc1ilDf8/NJXcprRZLXiHR7b4gAKE+DCAnqJVPIEvpyduZt3Jp9iVFZisLhJNG
+Qsib3tc6yH6yviwRe3QhTo7xhf8+ysyCBjJJ+wIDAQABAoIBAD35teF6O7zVoNtS
+EBnfbmLRYQE/4AoR2ljP+YRWubEAh6lv5+0dZ5pv5c8tJbXTiTKybBW7Q5bfqr6k
+qiJezi1AwZn9OPPs/uPa4RDsKWDKjX3Sc9rEEOOlB7kXhtAqN/xNl0BHSQN9p4SH
+W5PhQRNYsiGrinrIaD4oH+rhBylWPF6R/1lmP6y4NYA8Zz9h+FD2LIZTkDq67Bp0
+xxmtE33iHatmS2r7YDLl2HmpdKFK5oQVVPdeFmauhSpE7v1913HsbpQTU+wHpO6+
+5SxKI+InsQscodhIorqPBeBLdDBaridezBt/2h3DG7fhyh83UQW2CuAvchg6l7RU
+djbOUBECgYEA/ZWV2f+2coBoWOSVQuItszTnPhRZi1LS4KTFxh/3lrNGX3NjwHOg
+IHWSZ7u8Xe/HY42zEx4/ljIE4LBBdlCn6Ij+hDAmskdNYMyD2o4uHY3c/Y3I7uxK
+kdjXcf5aAFpibkaDQDdYeYwcU6um3mUQW/2VUJI6qrrY+xd+t2Tl5t8CgYEA3xCS
+2g/grlQi7Km/5VedwZjgDY+ifd5n6FPe2VE7mY5etJnSMGBegRR0YLLPNhFO/qDo
+W9RuXV9qRapJcLqdqZghr9TaAYy1wQlVoCr63ddgZZZxh8plkMCG9sB8k8pCsDW4
+oIsBwbSP0ic2HOt8PstX8PyVFlxzZCoftuuMTGUCgYBNxwSYQZMvGW1n3mxdgEvu
+DErkwo8YaYXeewtiEkn5QfFSs2ykCZLSgd0uzekfkrzALyT+tydfpOXUGJtrc5+c
+dfBCkRY9VhtIllHWxgck728ZodRAW98fTrf98bqfIxnPovb8yjzrwuqpSxu6WJsk
+6+lRNhiiZv7IPNOT4nGVVwKBgQCEaJwjIMWn9X19qg2kn2ufXZWxtw8nU/ut5wsj
+SJruPZpt7djcqneue2vRcpKZb5DKiM0kpWaVumukyr4pUj0ATLPCYcC+pr3Exjuz
+hY/AW3Z3FuRxTG0ZjY8PrZbFS4xmeJ0NfzYdu4abonb2l7n6tE2RWP1OdrZwQKju
+tcdkGQKBgCQAXo/bIVnQ9Kt0KLl71UJb0e1MJHp6BhdxURMH1vRW3TtHz4cAo+bb
+T1fVBzAm/yO8KIyd5IKDc8dZNSRWJ/iZ8Q95gDpEPYF7/oLme21bqLLD88djRtBA
+4Fpzy47NZge14S68es8A452a3Dy6lV2iR2DEyvfxSJmtoYB68Sly
+-----END RSA PRIVATE KEY-----
diff --git a/files/nodes/octopus/octopus_ssh.pub b/files/nodes/octopus/octopus_ssh.pub
new file mode 100644
index 0000000..7e55b3f
--- /dev/null
+++ b/files/nodes/octopus/octopus_ssh.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIwkl7f5uaK9hWWxRzCRljyBl2pEUmwhJhE9fEYo+mfkhq+6DK9FvEIVjb8P9zeprkeQWKpEVM73OYi8Lw5yPxU=
\ No newline at end of file
diff --git a/files/ssh/known_hosts b/files/ssh/known_hosts
index 324e292..d695887 100644
--- a/files/ssh/known_hosts
+++ b/files/ssh/known_hosts
@@ -16,6 +16,7 @@ hippo,hippo.bitmask.i,hippo.bitmask.net,85.17.92.143 ecdsa-sha2-nistp256 AAAAE2V
 ladybug,ladybug.dev.bitmask.i,ladybug.dev.bitmask.net,199.119.112.8 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIMGrmcqzAv5FRqx0apnBLJtM2dq9fYjPHTUx+Gr+E8zAbEZAKj9bK2/gh6Up5pYKHanOjxygEC2QjaoMk5D0SE=
 leech,leech.bitmask.i,leech.bitmask.net,198.252.153.85 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCiT3/fejkQIAny1f71ijFYaSEcYho6gR10z20ctmLumV3pHtXcFXtHqzAFJ07txANyef5P/yiIOl+/x/uRANjo=
 millipede,millipede.bitmask.i,millipede.bitmask.net,198.252.153.83 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBG02MrdDFaqZO11JbYSAAC5q/W/FCch3AQXo+dRcpErvHLmv9kWkrV1ESqfZ+s6qEfk8Aqv0vsym7YigMiGXlBo=
+octopus,octopus.unstable.bitmask.i,octopus.unstable.bitmask.net,199.119.112.16 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIwkl7f5uaK9hWWxRzCRljyBl2pEUmwhJhE9fEYo+mfkhq+6DK9FvEIVjb8P9zeprkeQWKpEVM73OYi8Lw5yPxU=
 panda,panda.unstable.bitmask.i,panda.unstable.bitmask.net,199.119.112.9 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMXoqGZhCbBt3P9H2LbE9gYlQZ2S/P/w7d8AGKdXGrbiPUJ8xLl8lNOy1Tia02NYuNYe8ehX5GjswLOwu59IkRY=
 rhino,rhino.dev.bitmask.i,rhino.dev.bitmask.net,202.85.227.204 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBWT/rRebh7gx4TOWgDoL2zK1r0BlxUDpYDOMCMFThELFZ1rASp+Yj8CipL3AztNRuK+VepXHmMmwSQftgYDiy0=
 seahorse,seahorse.unstable.bitmask.i,seahorse.unstable.bitmask.net,199.119.112.12 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBF/eygoaEj1Q+uLccErFztgbOKTkJKGUtlQawewC43aHOJw6r5ucYM3H41UqYLUEBK5VZ3j8uZha/49kdbdGC6Y=
diff --git a/nodes/octopus.json b/nodes/octopus.json
new file mode 100644
index 0000000..5e2c559
--- /dev/null
+++ b/nodes/octopus.json
@@ -0,0 +1,8 @@
+{
+  "ip_address": "199.119.112.16",
+  "services": "mx",
+  "ssh": {
+    "port": 4422
+  },
+  "tags": ["unstable", "dc"]
+}