Differences

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

--- servers [2019-05-22 19:12] – tim
+++ servers [2019-08-23 13:13] – tim
@@ Line 128: / Line 128: @@
   * [[https://admin.ehlab.uk/|Edinburgh Hacklab User Admin]]
-==== ehl-vm-observium.hacklab ====
-VM on magnesium.
-  * Observium network monitoring.
 ==== ehl-vm-atlassian.hacklab ====
@@ Line 149: / Line 143: @@
 ==== ehl-vm-logging.hacklab ====
-VM on magnesium.
+VM on magnesium. //Currently inactive due to Graylog consuming all the memory.//
   * Graylog
@@ Line 156: / Line 150: @@
     * Netflow: 4 hours
-==== ehl-vm-webapp ====
+==== ehl-vm-observium.hacklab ====
-Not deployed. Will host general web applications (but nothing security-sensitive).
+VM on magnesium.
-  * Planned: http/https frontend proxy
+  * Observium network monitoring.
-  * Planned: main website
-  * Planned: wiki
-  * Planned: training.ehlab.uk
-  * Planned: roundup.ehlab.uk
 ==== ehl-vm-things ====
@@ Line 171: / Line 161: @@
   * Planned: replacement for carbon (Hacklab IoT-related applications)
+==== ehl-vm-webapp ====
+Will host general web applications (but nothing security-sensitive).
+  * [[https://wiki.ehlab.uk/|wiki]]
+  * Planned: http/https frontend proxy
+  * Planned: main website
+  * Planned: training.ehlab.uk
+  * Planned: roundup.ehlab.uk
 ===== VMs (off-site) =====
@@ Line 184: / Line 184: @@
 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 ====