Merge pull request #31 from ISISComputingGroup/more_info_on_webservers

More information on web servers

Author: Tom-Willemsen

README.md

@@ -1,3 +1,6 @@
 # The IBEX Developer's Manual
 
 [Click here to go to the GitHub wiki with the developer's manual.](https://isiscomputinggroup.github.io/ibex_developers_manual/)
+
+## Development workflow
+See [Building the wiki locally](https://isiscomputinggroup.github.io/ibex_developers_manual/Editing-the-Wiki.html#building-the-wiki-locally) for instructions on local development. 

doc/systems/Webserver.md

@@ -1,8 +1,10 @@
 # Webserver
 
-NDAEXTWEB is a central Windows 2019 server that runs a number of the web services associated with IBEX. The login credentials for this are in sharepoint. The server holds:
+## NDAEXTWEB3
 
-* The [IBEX web dashboard](/webdashboard/Web-Dashboard)
+NDAEXTWEB3 is a central Windows 2019 server, which is hosted on the FIT Hyper-V cluster, that runs a number of the web services associated with IBEX. The login credentials for this are in sharepoint. The server holds:
+
+* The [old IBEX web dashboard (JSON_Bourne)](/webdashboard/Web-Dashboard)
 * The [Automation application](/processes/git_and_github/Automation-Application)
 * [MCR news](https://www.isis.stfc.ac.uk/Pages/MCR-News.aspx)
 * The SECI web dashboard
@@ -16,4 +18,7 @@ There should be 2 sites, Dataweb and WAP, which provide the above.
 
 If a new server is setup, then ciphers and old TLS versions may need to be disabled e.g. tls 1.0 and 1.1 as per https://docs.microsoft.com/en-us/windows-server/identity/ad-fs/operations/manage-ssl-protocols-in-ad-fs
 
- 
+
+## NDAEXTWEB4
+
+NDAEXTWEB4 is similar in that it also runs on the Hyper-V cluster. This currently hosts the [PVWS](/webdashboard/PVWS) which is a PVWS instance for the IBEX web dashboard. 

doc/webdashboard/Web-Dashboard.md

@@ -1,7 +1,7 @@
 # Web Dashboard
 
 ```{important}
-This page documents the old(though still current) web dashboard, also known as `JSON_Bourne`. The [new one](https://github.com/ISISComputingGroup/webdashboard) should have its architecture and how it's run explained in the README of its repository. 
+This page documents the old web dashboard, also known as `JSON_Bourne`. The [new one](https://github.com/ISISComputingGroup/webdashboard) should have its architecture and how it's run explained in the README of its repository. 
 ```
 
 The dataweb service allows some information about each instrument to be viewed in a webpage from both inside and outside the ISIS network. This service already exists for SECI instruments.