Merge branch 'new'.

1 files changed, 0 insertions, 27 deletions

diff --git a/server.html b/server.html
deleted file mode 100755
index 1de509f..0000000
--- a/server.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--#set var="title" value="About This Server" -->
-<!--#include file="includes/header.html" -->
-<h2>About This Server</h2>
-<h3>Hardware</h3>
-<p>
-	This server is an AMD Athlon II X2 250 Regor dual-core 3.0-GHz CPU sitting
-	next to one 2-GiB DDR3 SDRAM module, all on an Asus Micro-ATX motherboard
-	and sitting inside a very old and bare Gateway chassis. Connected to the
-	board is a 500-GB 7200-RPM hard disk drive. Powering the whole machine is a
-	400-W ATX power supply. One front-mounted 80-mm fan keeps the case and
-	components cool.
-</p>
-<h3>Software</h3>
-<p>
-	This server runs Debian GNU/Linux. There is no non-free software (not even
-	firmware) installed on this system. I even have plans to someday port
-	coreboot (freely-licensed and high-quality boot firmware) to my server's
-	motherboard (and I purchased a board for which a port should be easy).
-</p>
-<p>
-	With the help of apticron, I keep the system up-to-date with proposed
-	updates and security fixes. These documents are served by the Apache Web
-	server with mod_include for SSI parsing. My mail server of choice is Exim 4,
-	however port 25 is currently firewalled. I manage virtual hosts in Apache
-	httpd and Exim using <a href="projects/vhc/">VHC</a>.
-</p>
-<!--#include file="includes/footer.html" -->