From 2fe62e703c80bbba7ec0f7608535ed3be47cf5d5 Mon Sep 17 00:00:00 2001 From: Jacob Parker Date: Wed, 7 Mar 2012 16:10:46 -0500 Subject: [PATCH] added some content --- srv/About/Clubs/index.md | 3 +++ srv/About/Hardware.md | 54 ++++++++++++++++++++++++++++++++++++++ srv/About/History/index.md | 1 + srv/About/Office.md | 1 + 4 files changed, 59 insertions(+) create mode 100644 srv/About/Clubs/index.md create mode 100644 srv/About/Hardware.md create mode 100644 srv/About/History/index.md create mode 100644 srv/About/Office.md diff --git a/srv/About/Clubs/index.md b/srv/About/Clubs/index.md new file mode 100644 index 0000000..c4da381 --- /dev/null +++ b/srv/About/Clubs/index.md @@ -0,0 +1,3 @@ +In here, describe how to get a club account + +Generate a table of links ala About/Members listing active clubs that we host diff --git a/srv/About/Hardware.md b/srv/About/Hardware.md new file mode 100644 index 0000000..dbbeec6 --- /dev/null +++ b/srv/About/Hardware.md @@ -0,0 +1,54 @@ +Machines +========= + +For more technical details on our machines, see our [Machine List](http://wiki.csclub.uwaterloo.ca/Machine_List) page. All of our machines can be accessed via `ssh`. +Our machines run Linux (usually Ubuntu.) + +Office Terminals +------- +* bit-shifter (129.97.134.111) +
Hosts the webcam counter +* strombola (129.97.134.109) +
Connected to backup speakers +* maltodextrin (129.97.134.98) +
Hosts a webcam +
Chess robot +* natural-flavours (129.97.134.36) +* nullsleep (129.97.134.110) +
Runs mpd for music, is connected to our main speakers + +Servers +-------- +* caffeine (129.97.134.17) +
Web server +
Mail server +
Note: please do not use this machine for long computations. +* corn-syrup (129.97.134.72) +
This machine is intended for large computations. It has two Xeon processors and 32 GB of RAM. +* denardo (129.97.134.72) +
UltraSparc architecture +* taurine (129.97.134.34) +
This is the prefered machine for screen sessions and irssi. +* rainbowdragoneyes (129.97.134.127) +
MIPS architecture + +Syscom-only Servers +------- +* artificial-flavours (129.97.134.33) +
Backup server +* ginseng (129.97.134.89) +
File server +* glomag (129.97.134.70) +
This machine hosts the container for caffiene + +Gadgets +======== +Webcam Counter +------- +foo +Computer-Controlled Lightswitches +------- +bar +Robot Arm (Chess Robot) +------- +baz diff --git a/srv/About/History/index.md b/srv/About/History/index.md new file mode 100644 index 0000000..aec8c68 --- /dev/null +++ b/srv/About/History/index.md @@ -0,0 +1 @@ +We should do something here! Could be cool! diff --git a/srv/About/Office.md b/srv/About/Office.md new file mode 100644 index 0000000..4bf1eb4 --- /dev/null +++ b/srv/About/Office.md @@ -0,0 +1 @@ +Ettiquette, maybe a layout of the office?