added some content
authorJacob Parker <j3parker@csclub.uwaterloo.ca>
Wed, 7 Mar 2012 21:10:46 +0000 (16:10 -0500)
committerJacob Parker <j3parker@csclub.uwaterloo.ca>
Wed, 7 Mar 2012 21:10:46 +0000 (16:10 -0500)
srv/About/Clubs/index.md [new file with mode: 0644]
srv/About/Hardware.md [new file with mode: 0644]
srv/About/History/index.md [new file with mode: 0644]
srv/About/Office.md [new file with mode: 0644]

diff --git a/srv/About/Clubs/index.md b/srv/About/Clubs/index.md
new file mode 100644 (file)
index 0000000..c4da381
--- /dev/null
@@ -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 (file)
index 0000000..dbbeec6
--- /dev/null
@@ -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
+-------
+* <b>bit-shifter</b> (129.97.134.111)
+<br> Hosts the webcam counter
+* <b>strombola</b> (129.97.134.109)
+<br> Connected to backup speakers
+* <b>maltodextrin</b> (129.97.134.98)
+<br>Hosts a webcam
+<br>Chess robot
+* <b>natural-flavours</b> (129.97.134.36)
+* <b>nullsleep</b> (129.97.134.110)
+<br>Runs mpd for music, is connected to our main speakers
+
+Servers
+--------
+* <b>caffeine</b> (129.97.134.17)
+<br>Web server
+<br>Mail server
+<br>Note: please do not use this machine for long computations.
+* <b>corn-syrup</b> (129.97.134.72)
+<br>This machine is intended for large computations. It has two Xeon processors and 32 GB of RAM.
+* <b>denardo</b> (129.97.134.72)
+<br>UltraSparc architecture
+* <b>taurine</b> (129.97.134.34)
+<br>This is the prefered machine for screen sessions and irssi.
+* <b>rainbowdragoneyes</b> (129.97.134.127)
+<br>MIPS architecture
+
+Syscom-only Servers
+-------
+* <b>artificial-flavours</b> (129.97.134.33)
+<br>Backup server
+* <b>ginseng</b> (129.97.134.89)
+<br>File server
+* <b>glomag</b> (129.97.134.70)
+<br>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 (file)
index 0000000..aec8c68
--- /dev/null
@@ -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 (file)
index 0000000..4bf1eb4
--- /dev/null
@@ -0,0 +1 @@
+Ettiquette, maybe a layout of the office?