From 6b4419835e7a59c5f155c5bf5951b6a09536bf37 Mon Sep 17 00:00:00 2001
From: Zachary Seguin <ztseguin@csclub.uwaterloo.ca>
Date: Mon, 28 Nov 2016 19:06:49 -0500
Subject: [PATCH] Add new hosts; update names of networks

---
 hosts.in | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/hosts.in b/hosts.in
index a53dcd4..88560a5 100644
--- a/hosts.in
+++ b/hosts.in
@@ -9,12 +9,8 @@
 !ff02::3     ip6-allhosts
 
 # Math Student Orgs Net
-mathstudentorgs.net.uwaterloo.ca
-
-mc-cs1-mathstudentorgsnet.uwaterloo.ca
-mc-cs2-mathstudentorgsnet.uwaterloo.ca
-
-mc-cs-cvl.net.uwaterloo.ca
+mathstudentorgs-net.nsx.uwaterloo.ca
+mc-cs2.nsx.uwaterloo.ca
 
 # CSC - General Use
 
@@ -51,6 +47,8 @@ kadmin
 
 hydrazine
 electrons
+logstash
+sandstorm
 
 mail
 
@@ -79,6 +77,11 @@ mirror
 debian
 netbox
 
+# CSC - Web improvement project
+load-balancer
+caffeine-00
+caffeine-01
+
 # CSC - Testnodes
 testnode1
 testnode2
@@ -88,8 +91,7 @@ testnode5
 
 # CSC - IPMI/LOM
 
-mso-private.net.uwaterloo.ca
-mc-cs1-mso-private.uwaterloo.ca
+mso-private-net.ns.uwaterloo.ca
 mc-cs2-mso-private.uwaterloo.ca
 
 kvm