Mfa Tweaks / Updates

_static/js/custom.js

@@ -4,7 +4,7 @@ so cannot use sphinx :ref: for output destination URIs relative to the current p
 Instead, find the appropriate link within the current page, to add the anchor to the announcement.
 This does not currently support linking outside of the documentation website.
 */
-console.log("foo")
+/*
 window.onload = function () {
     // Only apply the link if the annoucement content matches (incase the announcement is changed but this file is not.)
     expectedAnnouncementContent = "MFA Deployment in Progress";
@@ -45,4 +45,5 @@ window.onload = function () {
             }
         }
     }
-}
+}
+*/

conf.py

@@ -92,7 +92,7 @@
     # Reset the navigation bar footer (html)
     "extra_navbar": "",
     # Add an announcement bar, visible at the top of each page.
-    "announcement": "MFA Deployment in Progress",
+    # "announcement": "MFA Deployment in Progress",
     # Add the traditional footer theme and sphinx acknowledgements
     "extra_footer": f"Built with <a href=\"http://sphinx-doc.org/\">Sphinx</a> {sphinx.__version__} using a theme by the <a href=\"https://ebp.jupyterbook.org/\">Executable Book Project</a>."
 }

usage/index.rst

@@ -28,6 +28,12 @@ fronts the two login nodes, ``login1.bede.dur.ac.uk`` and
 ``login2.bede.dur.ac.uk``). SSH or X2GO should be used for all interaction with
 the machine (including shell access, file transfer and graphics).
 
+.. warning::
+
+   Please use an SSH client and **not** X2GO the first time you ever log in to
+   Bede, or immediately after a password reset. Your MFA token will be
+   generated, but X2GO will not show it to you.
+
 The login nodes are shared between all users of the service and
 therefore should only be used for light interactive work, for example:
 downloading and compiling software, editing files, preparing jobs and
@@ -44,17 +50,13 @@ batch scheduler, and so demanding applications should be submitted to it
 Multi Factor Authentication
 ---------------------------
 
-.. note::
-
-   We are gradually rolling out MFA, so this may not yet apply to your account.
-
 When connecting to the login nodes, the system has to validate your
 identity. In order to help keep accounts secure, Bede employs a
 technique called Multi Factor Authentication (MFA), where something you
 know (your password), is combined with something you have (an app on
 a mobile device, such as your phone).
 
-When you first login to Bede, or after a password reset, you will be prompted
+When you first login to Bede, or after a password reset, you should use SSH to connect to the machine (rather than x2go) and you will be prompted
 to:
 
 1. Change your password
@@ -80,13 +82,7 @@ please contact `support <../faq/#faq-helpsupport>`__ for options.
 
 **If you have lost your password or MFA token, please use EPCC's SAFE system to request a password reset for your Bede login account, which we normally aim to process within a working day.**
 
-If you are finding that you are having to use your password and a MFA token too many times, we have provided some tips on `how to reduce the frequency that MFA is required <../faq/#faq-reducemfa>`__
-
-.. warning::
-
-   When MFA is fully deployed, all logins will need to be done this way. Alternative
-   methods, such as SSH user keys, will be disabled.
-
+If you are finding that you are having to use your password and a MFA token too many times, we have provided some tips on `how to reduce the frequency that MFA is required <../faq/#faq-reducemfa>`__.
 
 .. _usage-x2go: