Differences

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

--- servers [2019-03-23 12:44] – [ponyexpress.ehlab.uk] tim
+++ servers [2019-05-22 19:14] – tim
@@ Line 95: / Line 95: @@
 VM on magnesium.
-  * [[https://admin.ehlab.uk/|Edinburgh Hacklab User Admin]]
   * LDAP master
-  * Tool access controller
   * [[https://gitea.ehlab.uk/|Gitea]] GIT hosting
@@ Line 118: / Line 116: @@
   * [[https://discourse.ehlab.uk/|Discourse]] forum
-==== ehl-vm-doors.hacklab ====
+==== ehl-vm-access.hacklab ====
 VM on magnesium.
+  * Tool access controller
   * Door access controller
-==== ehl-vm-observium.hacklab ====
+==== ehl-vm-admin.hacklab =====
 VM on magnesium.
-  * Observium network monitoring.
+  * [[https://admin.ehlab.uk/|Edinburgh Hacklab User Admin]]
 ==== ehl-vm-atlassian.hacklab ====
@@ Line 150: / Line 149: @@
     * MQTT: 1 year
     * Netflow: 4 hours
+==== ehl-vm-observium.hacklab ====
+VM on magnesium.
+  * Observium network monitoring.
+==== ehl-vm-things ====
+Not deployed.
+  * Planned: replacement for carbon (Hacklab IoT-related applications)
 ==== ehl-vm-webapp ====
@@ Line 160: / Line 171: @@
   * Planned: training.ehlab.uk
   * Planned: roundup.ehlab.uk
-==== ehl-vm-things ====
-Not deployed.
-  * Planned: replacement for carbon (Hacklab IoT-related applications)
 ===== VMs (off-site) =====