Differences

This shows you the differences between two versions of the page.

--- servers [2019-05-22 19:17] – [ehl-vm-logging.hacklab] tim
+++ servers [2019-08-29 15:13] – tim
@@ Line 13: / Line 13: @@
 Hacklab infrastructure and member VMs.
-==== ganymede (or kay/gaheris) ====
+==== ganymede ====
-HP ML115 mini tower server. FreeNAS Server hosting file shares.
+HP ML115 mini tower, [[http://cpuboss.com/cpu/AMD-Opteron-1210-HE|AMD Opteron 1210 HE]], 3GB RAM, 4x 250GB SATA.\\
+FreeNAS server hosting file shares and home directories.
+Due to be replaced with a HP Microserver N36L with 8GB RAM.
 ==== zinc ====
@@ Line 122: / Line 125: @@
   * Tool access controller
   * Door access controller
+  * Locker access controller
 ==== ehl-vm-admin.hacklab =====
@@ Line 164: / Line 168: @@
 ==== ehl-vm-webapp ====
-Not deployed. Will host general web applications (but nothing security-sensitive).
+Will host general web applications (but nothing security-sensitive).
+  * [[https://wiki.ehlab.uk/|wiki]]
   * Planned: http/https frontend proxy
   * Planned: main website
-  * Planned: wiki
   * Planned: training.ehlab.uk
   * Planned: roundup.ehlab.uk
@@ Line 184: / Line 188: @@
 VM hosted in London by DigitalOcean.
-  * Web server for [[http://www.edinburghhacklab.com]] and [[http://wiki.edinburghhacklab.com]]
+  * Web server for [[http://www.edinburghhacklab.com]] <del>and [[http://wiki.edinburghhacklab.com]]</del>
 ==== palladium.ehlab.uk ====