Differences

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

--- servers [2019-08-29 15:13] – tim
+++ servers [2020-02-24 12:50] – [helium.edinburghhacklab.com] tim
@@ Line 15: / Line 15: @@
 ==== ganymede ====
-HP ML115 mini tower, [[http://cpuboss.com/cpu/AMD-Opteron-1210-HE|AMD Opteron 1210 HE]], 3GB RAM, 4x 250GB SATA.\\
+HP Microserver N36L, 8GB 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 ====
-Raspberry Pi.
+Raspberry Pi 2 Model B.
   * Secondary [[dnsdhcp|DNS and DHCP]]
@@ Line 89: / Line 87: @@
   * [[https://status.ehlab.uk/|Status]] webapp
   * InfluxDB + [[https://lab.ehlab.uk/grafana/|Grafana]]
-  * [[https://training.ehlab.uk/|Training docs]] generator
+  * [[https://training.ehlab.uk/|Training docs]] generator - move to ehl-vm-webapp.
   * [[https://roundup.ehlab.uk/|Roundup]] issue tracker
   * iZettle webhook receiver
@@ Line 171: / Line 169: @@
   * [[https://wiki.ehlab.uk/|wiki]]
+  * [[https://edinburghhacklab.com/|main website]]
   * Planned: http/https frontend proxy
-  * Planned: main website
   * Planned: training.ehlab.uk
   * Planned: roundup.ehlab.uk
@@ Line 184: / Line 182: @@
   * LDAP slave
-==== helium.edinburghhacklab.com ====
-VM hosted in London by DigitalOcean.
-  * Web server for [[http://www.edinburghhacklab.com]] <del>and [[http://wiki.edinburghhacklab.com]]</del>
 ==== palladium.ehlab.uk ====