From acc50f5acc8edcddff38bdcd074b3b02d7469269 Mon Sep 17 00:00:00 2001
From: Sean Hunt <scshunt@csclub.uwaterloo.ca>
Date: Wed, 27 Aug 2014 12:31:47 -0400
Subject: [PATCH] Lots of updates to servers.

So that they, y'know, reflect *reality*.
---
 nodes.ia    | 80 ++++++++++++++++++++++++++++-------------------------
 packages.ia |  3 +-
 2 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/nodes.ia b/nodes.ia
index e63bbee..37d11a7 100644
--- a/nodes.ia
+++ b/nodes.ia
@@ -23,16 +23,16 @@ profiles csclub office machine amd64 trusty;
 # Computer Science Club Servers (General Use)
 
 @caffeine
-profiles csclub server container amd64 general-use squeeze;
+profiles csclub server container amd64 general-use wheezy;
 
 @taurine
-profiles csclub server machine amd64 general-use squeeze x-core;
+profiles csclub server machine amd64 general-use wheezy x-core;
 
 @corn-syrup
-profiles csclub server machine amd64 general-use squeeze;
+profiles csclub server machine amd64 general-use jessie;
 
-@ascorbic-acid
-profiles csclub server machine sparc general-use squeeze nosmp;
+# @ascorbic-acid
+# profiles csclub server machine sparc general-use squeeze nosmp;
 
 @potassium-citrate
 profiles csclub server machine alpha lenny;
@@ -40,31 +40,37 @@ profiles csclub server machine alpha lenny;
 @denardo
 profiles csclub server machine sparc general-use squeeze;
 
-@acesulfame-potassium
-profiles csclub server machine i386 general-use squeeze;
+# @acesulfame-potassium
+# profiles csclub server machine i386 general-use squeeze;
 
 @sid
-profiles csclub server container amd64 general-use wheezy;
+profiles csclub server container amd64 general-use sid;
 
 @high-fructose-corn-syrup
-profiles csclub server machine amd64 general-use squeeze;
+profiles csclub server machine amd64 general-use wheezy;
+
+@sucrose
+profiles csclub server machine amd64 general-use jessie;
+
+@dextrose
+profiles csclub server machine amd64 general-use jessie;
 
 # Computer Science Club Servers (Restricted)
 
 @glomag
-profiles csclub server machine amd64 squeeze;
+profiles csclub server machine amd64 wheezy;
 
 @sodium-benzoate
-profiles csclub server machine amd64 squeeze;
+profiles csclub server machine amd64 wheezy;
 
 @ginseng
-profiles csclub server machine amd64 squeeze;
+profiles csclub server machine amd64 wheezy;
 
 @artificial-flavours
-profiles csclub server machine i386 squeeze mta;
+profiles csclub server machine i386 wheezy mta;
 
 @mail
-profiles csclub server container amd64 squeeze mta;
+profiles csclub server container amd64 wheezy mta;
 
 @auth1
 profiles csclub server container amd64 wheezy;
@@ -72,48 +78,48 @@ profiles csclub server container amd64 wheezy;
 # Computer Science Club Misc Machines
 
 # unrestricted but too slow for general-use
-@sodium-citrate
-profiles csclub server machine mips squeeze general-small;
+# @sodium-citrate
+# profiles csclub server machine mips squeeze general-small;
 
 # unrestricted but too slow for general-use
-@goto80
-profiles csclub server machine armel squeeze general-small;
+# @goto80
+# profiles csclub server machine armel squeeze general-small;
 
 # unrestricted but too slow for general-use
-@binaerpilot
-profiles csclub server machine armel squeeze general-small;
+# @binaerpilot
+# profiles csclub server machine armel squeeze general-small;
 
 # unrestricted but too slow for general-use
-@anamanaguchi
-profiles csclub server machine armel squeeze general-small;
+# @anamanaguchi
+# profiles csclub server machine armel squeeze general-small;
 
 # unrestricted but too slow for general-use
-@paza
-profiles csclub server machine powerpc squeeze general-small;
+# @paza
+# profiles csclub server machine powerpc squeeze general-small;
 
 # unrestricted but too slow for general-use
-@xinon
-profiles csclub server machine powerpc squeeze general-small;
+# @xinon
+# profiles csclub server machine powerpc squeeze general-small;
 
 # unrestricted but too slow for general-use
-@rainbowdragoneyes
-profiles csclub server machine mipsel squeeze general-small;
+# @rainbowdragoneyes
+# profiles csclub server machine mipsel squeeze general-small;
 
 # Computational Math Club Office Terminals
 
-@inkpen
-profiles cmclub office machine amd64 natty;
+# @inkpen
+# profiles cmclub office machine amd64 natty;
 
-@waffles
-profiles cmclub office machine amd64 natty;
+# @waffles
+# profiles cmclub office machine amd64 natty;
 
-@muffins
-profiles cmclub office machine amd64 natty;
+# @muffins
+# profiles cmclub office machine amd64 natty;
 
 # Computational Math Club Servers
 
-@staples
-profiles cmclub server machine amd64 general-use squeeze mta;
+# @staples
+# profiles cmclub server machine amd64 general-use squeeze mta;
 
 # Non-CSC
 
@@ -142,7 +148,7 @@ profiles auth-core nfs-core;
 
 # OS releases
 
-@quantal
+@quantal/raring/saucy/trusty
 profiles ubuntu;
 
 @squeeze/wheezy/jessie/sid
diff --git a/packages.ia b/packages.ia
index 1bc4177..41477b9 100644
--- a/packages.ia
+++ b/packages.ia
@@ -289,7 +289,8 @@ if @general-use {
 
     # editors
     install nvi bvi wily
-            @X vim-gnome;
+            @X vim-gnome
+            @!X vim-nox;
 
     # crypto
     install gnupg-agent gnupg2 openssl;