From b2bf4dd16a94a7e78797c64eb39d9260ff8ef63e Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 20 Sep 2016 15:47:33 -0400
Subject: add upgrade nodes

---
 nodes/checkerspot.json    | 17 +++++++++++++++++
 nodes/cloak.json          | 14 ++++++++++++++
 nodes/dogface.json        | 14 ++++++++++++++
 nodes/hairstreak.json     |  8 ++++++++
 nodes/monarch.json        | 17 +++++++++++++++++
 nodes/spicebush.json      |  8 ++++++++
 tags/disabled.json        |  3 +++
 tags/upgrade.json         |  3 +++
 users/micah/micah_ssh.pub |  1 +
 9 files changed, 85 insertions(+)
 create mode 100644 nodes/checkerspot.json
 create mode 100644 nodes/cloak.json
 create mode 100644 nodes/dogface.json
 create mode 100644 nodes/hairstreak.json
 create mode 100644 nodes/monarch.json
 create mode 100644 nodes/spicebush.json
 create mode 100644 tags/disabled.json
 create mode 100644 tags/upgrade.json
 create mode 100644 users/micah/micah_ssh.pub

diff --git a/nodes/checkerspot.json b/nodes/checkerspot.json
new file mode 100644
index 0000000..286b5a7
--- /dev/null
+++ b/nodes/checkerspot.json
@@ -0,0 +1,17 @@
+{
+  "ip_address": "0.0.0.0",
+  "openvpn": {
+    "gateway_address": "REQUIRED",
+    "ports": [
+      "443"
+    ],
+    "protocols": [
+      "tcp"
+    ]
+  },
+  "services": "openvpn",
+  "tags": "disabled",
+  "vm": {
+    "id": ""
+  }
+}
diff --git a/nodes/cloak.json b/nodes/cloak.json
new file mode 100644
index 0000000..7b31ded
--- /dev/null
+++ b/nodes/cloak.json
@@ -0,0 +1,14 @@
+{
+  "ip_address": "54.70.243.80",
+  "services": [
+    "tor"
+  ],
+  "tags": "upgrade",
+  "tor": {
+    "bandwidth_rate": 100,
+    "type": "exit"
+  },
+  "vm": {
+    "id": "i-b79eb5af"
+  }
+}
diff --git a/nodes/dogface.json b/nodes/dogface.json
new file mode 100644
index 0000000..47590bd
--- /dev/null
+++ b/nodes/dogface.json
@@ -0,0 +1,14 @@
+{
+  "couch": {
+    "mode": "plain"
+  },
+  "ip_address": "54.71.7.146",
+  "services": [
+    "couchdb",
+    "soledad"
+  ],
+  "tags": "upgrade",
+  "vm": {
+    "id": "i-c29db6da"
+  }
+}
diff --git a/nodes/hairstreak.json b/nodes/hairstreak.json
new file mode 100644
index 0000000..082b4ee
--- /dev/null
+++ b/nodes/hairstreak.json
@@ -0,0 +1,8 @@
+{
+  "ip_address": "54.69.235.78",
+  "services": "mx",
+  "tags": "upgrade",
+  "vm": {
+    "id": "i-ce9db6d6"
+  }
+}
diff --git a/nodes/monarch.json b/nodes/monarch.json
new file mode 100644
index 0000000..83f7e79
--- /dev/null
+++ b/nodes/monarch.json
@@ -0,0 +1,17 @@
+{
+  "ip_address": "52.89.186.55",
+  "services": [
+    "monitor",
+    "tor",
+    "webapp"
+  ],
+  "tags": "upgrade",
+  "tor": {
+    "hidden_service": {
+      "active": true
+    }
+  },
+  "vm": {
+    "id": "i-989db680"
+  }
+}
diff --git a/nodes/spicebush.json b/nodes/spicebush.json
new file mode 100644
index 0000000..9468100
--- /dev/null
+++ b/nodes/spicebush.json
@@ -0,0 +1,8 @@
+{
+  "ip_address": "54.71.1.247",
+  "services": "static",
+  "tags": "upgrade",
+  "vm": {
+    "id": "i-579db64f"
+  }
+}
diff --git a/tags/disabled.json b/tags/disabled.json
new file mode 100644
index 0000000..94563a0
--- /dev/null
+++ b/tags/disabled.json
@@ -0,0 +1,3 @@
+{
+  "environment": "disabled"
+}
diff --git a/tags/upgrade.json b/tags/upgrade.json
new file mode 100644
index 0000000..a43bc12
--- /dev/null
+++ b/tags/upgrade.json
@@ -0,0 +1,3 @@
+{
+	"environment": "upgrade"
+}
diff --git a/users/micah/micah_ssh.pub b/users/micah/micah_ssh.pub
new file mode 100644
index 0000000..8976952
--- /dev/null
+++ b/users/micah/micah_ssh.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC5xvAs8c8KmJ/Lt2TiYthxOVEgUkprbLWVOwK1Hmc+3h6rV4iyT//8dv8Ov79ZMOAuqQhQ5fz7RckOTqoexW/kzbFhXw5NEt+eqHonayiAh8LVt2K79GbMtWmS2ss81ivDyQkaW3+PK5IDibsoOfNeuAZ17Hgudatjc4v7WEjVliYBwPLAA5DUZt8wf7nNQX3moHGE8A+d3S0UDQyEmT657D1p8jmrpg9qTL7nuvjZTq7v/mVErnIDUY83FGdrT1F+gPlCLetzSDeaNkYFm+RjVixF2pZKT+BsHkj/8nTJw7NBh/BTG34pSyuCmepwBBwPEISkfMAEA9Ag+TXq+Oe53GmmBa92asusM7XzyPTxUcvnUAp4kxn5i+65dDx4F2//cVe7+CNCdl8N5p88Xe3jmsTeEdEXnmXPFOBbvAE0kikDE30FqU06u/pLDy7ZG3JTZZtvvFuKrYokgQysDMLaxlMVMANs9WugJkOlexzOeDDgptPf8f2fQs2Q9Xo0xq1wrtD4kdopgtF1LLEFcUDKp7+nev+czzNWbv6ccZotlicZIqauYnBjjGPYz0sC4OCvZjz7bK7nDsdHoaZBSl1YUhTyLUDH2XH8V1lbEOJhfJSp+vZMJETIe8oP+uByEt01FIt8JsRhijXoKCPfXp59P9d3KS8vuaUsCEVrpkkalQ==
\ No newline at end of file
-- 
cgit v1.2.3