From a7067d5efd8ca3ccbc4bc6f9d9f356e1949ad7ec Mon Sep 17 00:00:00 2001
From: caubet_m <marc.caubet@psi.ch>
Date: Mon, 2 Sep 2019 17:42:24 +0200
Subject: [PATCH] SD 02.09.2019: merlin-l-002 has now NoMachine

---
 _data/sidebars/merlin6_sidebar.yml                              | 1 +
 .../merlin6/02 accessing-merlin6/accessing-interactive-nodes.md | 2 +-
 pages/merlin6/02 accessing-merlin6/nomachine.md                 | 2 +-
 .../merlin6/{05 announcements => 98 announcements}/downtimes.md | 0
 pages/merlin6/{06 support => 99 support}/contact.md             | 0
 pages/merlin6/{06 support => 99 support}/known-problems.md      | 0
 .../{06 support => 99 support}/migration-from-merlin5.md        | 0
 pages/merlin6/{06 support => 99 support}/troubleshooting.md     | 0
 8 files changed, 3 insertions(+), 2 deletions(-)
 rename pages/merlin6/{05 announcements => 98 announcements}/downtimes.md (100%)
 rename pages/merlin6/{06 support => 99 support}/contact.md (100%)
 rename pages/merlin6/{06 support => 99 support}/known-problems.md (100%)
 rename pages/merlin6/{06 support => 99 support}/migration-from-merlin5.md (100%)
 rename pages/merlin6/{06 support => 99 support}/troubleshooting.md (100%)

diff --git a/_data/sidebars/merlin6_sidebar.yml b/_data/sidebars/merlin6_sidebar.yml
index 9226644..441ddae 100644
--- a/_data/sidebars/merlin6_sidebar.yml
+++ b/_data/sidebars/merlin6_sidebar.yml
@@ -49,6 +49,7 @@ entries:
       url: /merlin6/jupyterhub.html
     - title: Jupyterlab
       url: /merlin6/jupyterlab.html
+  - title: 
   - title: Announcements
     folderitems:
     - title: Downtimes
diff --git a/pages/merlin6/02 accessing-merlin6/accessing-interactive-nodes.md b/pages/merlin6/02 accessing-merlin6/accessing-interactive-nodes.md
index 46d568a..014c671 100644
--- a/pages/merlin6/02 accessing-merlin6/accessing-interactive-nodes.md	
+++ b/pages/merlin6/02 accessing-merlin6/accessing-interactive-nodes.md	
@@ -19,7 +19,7 @@ The Merlin6 login nodes are the following:
 | Hostname                | SSH | NoMachine | #cores | #Threads | CPU                   | Memory | Scratch    | Scratch Mountpoint  |
 | -------------------     | --- | --------- | ------ |:--------:| :-------------------- | ------ | ---------- | :------------------ |
 | merlin-l-001.psi.ch     | yes | yes       | 2 x 22 | 2        | Intel Xeon Gold 6152  | 384GB  | 1.8TB NVMe | ``/scratch``        |
-| merlin-l-002.psi.ch     | yes | -         | 2 x 22 | 2        | Intel Xeon Gold 6142  | 384GB  | 1.8TB NVMe | ``/scratch``        |
+| merlin-l-002.psi.ch     | yes | yes       | 2 x 22 | 2        | Intel Xeon Gold 6142  | 384GB  | 1.8TB NVMe | ``/scratch``        |
 | merlin-l-01.psi.ch      | yes | -         | 2 x 16 | 2        | Intel Xeon E5-2697Av4 | 512GB  | 100GB SAS  | ``/scratch``        |
 | ~~merlin-l-02.psi.ch~~  | -   | -         | 2 x 16 | 2        | Intel Xeon E5-2697Av4 | 512GB  | 100GB SAS  | ``/scratch``        |
 
diff --git a/pages/merlin6/02 accessing-merlin6/nomachine.md b/pages/merlin6/02 accessing-merlin6/nomachine.md
index b2a8059..21f0207 100644
--- a/pages/merlin6/02 accessing-merlin6/nomachine.md	
+++ b/pages/merlin6/02 accessing-merlin6/nomachine.md	
@@ -31,7 +31,7 @@ to the IT Department by opening a PSI Service Now ticket:
 The Merlin6 NoMachine service is located **only** in the following login nodes:
 
 * `merlin-l-001.psi.ch`
-* ~~`merlin-l-002.psi.ch`~~ (not available yet)
+* `merlin-l-002.psi.ch`
 
 Below are explained all the steps necessary for configuring the access to the 
 NoMachine service running on a login node.
diff --git a/pages/merlin6/05 announcements/downtimes.md b/pages/merlin6/98 announcements/downtimes.md
similarity index 100%
rename from pages/merlin6/05 announcements/downtimes.md
rename to pages/merlin6/98 announcements/downtimes.md
diff --git a/pages/merlin6/06 support/contact.md b/pages/merlin6/99 support/contact.md
similarity index 100%
rename from pages/merlin6/06 support/contact.md
rename to pages/merlin6/99 support/contact.md
diff --git a/pages/merlin6/06 support/known-problems.md b/pages/merlin6/99 support/known-problems.md
similarity index 100%
rename from pages/merlin6/06 support/known-problems.md
rename to pages/merlin6/99 support/known-problems.md
diff --git a/pages/merlin6/06 support/migration-from-merlin5.md b/pages/merlin6/99 support/migration-from-merlin5.md
similarity index 100%
rename from pages/merlin6/06 support/migration-from-merlin5.md
rename to pages/merlin6/99 support/migration-from-merlin5.md
diff --git a/pages/merlin6/06 support/troubleshooting.md b/pages/merlin6/99 support/troubleshooting.md
similarity index 100%
rename from pages/merlin6/06 support/troubleshooting.md
rename to pages/merlin6/99 support/troubleshooting.md