From 6a0280d733842f3fc3787622a7e3d551fadfa46b Mon Sep 17 00:00:00 2001
From: Martin Schroschk <martin.schroschk@tu-dresden.de>
Date: Wed, 15 Sep 2021 09:14:31 +0200
Subject: [PATCH] Update overview page

* Delete old page
---
 .../docs/access/key_fingerprints.md           |  6 +-
 doc.zih.tu-dresden.de/docs/access/overview.md | 31 +++----
 .../docs/access/ssh_login.md                  | 14 +--
 .../docs/access/ssh_mit_putty.md              | 87 -------------------
 doc.zih.tu-dresden.de/mkdocs.yml              |  4 +-
 5 files changed, 27 insertions(+), 115 deletions(-)
 delete mode 100644 doc.zih.tu-dresden.de/docs/access/ssh_mit_putty.md

diff --git a/doc.zih.tu-dresden.de/docs/access/key_fingerprints.md b/doc.zih.tu-dresden.de/docs/access/key_fingerprints.md
index 1ef85b835..6be427f53 100644
--- a/doc.zih.tu-dresden.de/docs/access/key_fingerprints.md
+++ b/doc.zih.tu-dresden.de/docs/access/key_fingerprints.md
@@ -1,7 +1,9 @@
 # SSH Key Fingerprints
 
-The key fingerprints of login and export nodes can occasionally change. This page holds up-to-date
-fingerprints.
+!!! hint
+
+    The key fingerprints of login and export nodes can occasionally change. This page holds
+    up-to-date fingerprints.
 
 ## Login Nodes
 
diff --git a/doc.zih.tu-dresden.de/docs/access/overview.md b/doc.zih.tu-dresden.de/docs/access/overview.md
index e324c4cad..09845b094 100644
--- a/doc.zih.tu-dresden.de/docs/access/overview.md
+++ b/doc.zih.tu-dresden.de/docs/access/overview.md
@@ -1,21 +1,18 @@
-# Access to the Cluster
+# Access to ZIH Systems
 
-## SSH access
+There are several different ways to access ZIH systems depending on the intended usage:
 
-Important note: ssh to Taurus is only possible from inside TU Dresden Campus. Users from outside
-should use VPN
-([see here](https://tu-dresden.de/zih/dienste/service-katalog/arbeitsumgebung/zugang_datennetz/vpn)).
+* [SSH connection](ssh_login.md) is the classical way to connect to the login nodes and work from
+    the command line to set up experiments and manage batch jobs
+* [Desktop Cloud Visualization](desktop_cloud_visualization.md) provides a virtual Linux desktop
+  with access to GPU ressources for OpenGL 3D applications
+* [WebVNC service](graphical_applications_with_webvnc.md) allows better support for graphical
+   applications than SSH with X forwarding
+* [JupyterHub service](jupyterhub.md) offers a quick and easy way to work with Jupyter notebooks on
+   ZIH systems.
 
-The recommended way to connect to the HPC login servers directly via ssh:
+!!! hint
 
-```Bash
-ssh <zih-login>@taurus.hrsk.tu-dresden.de
-```
-
-Please put this command in the terminal and replace `zih-login` with your login that you received
-during the access procedure. Accept the host verifying and enter your password. You will be loaded
-by login nodes in your Taurus home directory.  This method requires two conditions: Linux OS,
-workstation within the campus network. For other options and details check the Login page.
-
-Useful links: [Access]**todo link**, [Project Request Form](../application/request_for_resources.md),
-[Terms Of Use]**todo link**
+    Prerequisite for accessing ZIH systems is a HPC project and a login. Please refer to the pages
+    within [Application for Login and Resources](../application/overview.md) for detailed
+    information.
diff --git a/doc.zih.tu-dresden.de/docs/access/ssh_login.md b/doc.zih.tu-dresden.de/docs/access/ssh_login.md
index 6adaa8a32..d96de9a82 100644
--- a/doc.zih.tu-dresden.de/docs/access/ssh_login.md
+++ b/doc.zih.tu-dresden.de/docs/access/ssh_login.md
@@ -4,9 +4,9 @@ For security reasons, ZIH systems are only accessible for hosts within the domai
 
 ## Virtual Private Network (VPN)
 
-To access HPC systems from outside the campus networks it's recommended to set up a VPN connection to
-enter the campus network. While active it allows the user to connect directly to the HPC login
-nodes.
+To access the ZIH systems from outside the campus networks it's recommended to set up a VPN
+connection to enter the campus network. While active, it allows the user to connect directly to the
+HPC login nodes.
 
 For more information on our VPN and how to set it up, please visit the corresponding
 [ZIH service catalogue page](https://tu-dresden.de/zih/dienste/service-katalog/arbeitsumgebung/zugang_datennetz/vpn).
@@ -58,7 +58,7 @@ marie@local$ ssh -XC <zih-login>@taurus.hrsk.tu-dresden.de
     Also consider to use a [DCV session](desktop_cloud_visualization.md) for remote desktop
     visualization at ZIH systems.
 
-### Password-less SSH
+### Password-Less SSH
 
 Of course, password-less SSH connecting is supported at ZIH. All public SSH keys for ZIH systems
 have to be generated following these rules:
@@ -79,9 +79,9 @@ Enter passphrase for key 'id-ed25519':
 
 We recommend one of the following applications:
 
-  * MobaXTerm: [homepage](https://mobaxterm.mobatek.net) | [ZIH Tutorial](misc/basic_usage_of_MobaXterm.pdf)
-  * PuTTY: [homepage](https://www.putty.org) | [ZIH Tutorial](misc/basic_usage_of_PuTTY.pdf)
-  * OpenSSH Server: [docs](https://docs.microsoft.com/de-de/windows-server/administration/openssh/openssh_install_firstuse)
+  * [MobaXTerm](https://mobaxterm.mobatek.net): [ZIH documentation](misc/basic_usage_of_MobaXterm.pdf)
+  * [PuTTY](https://www.putty.org): [ZIH documentation](misc/basic_usage_of_PuTTY.pdf)
+  * OpenSSH Server: [docs](https://docs.microso.com/de-de/windows-server/administration/openssh/openssh_install_firstuse)
 
 The page [key fingerprints](key_fingerprints.md) holds the up-to-date fingerprints for the login
 nodes. Make sure they match.
diff --git a/doc.zih.tu-dresden.de/docs/access/ssh_mit_putty.md b/doc.zih.tu-dresden.de/docs/access/ssh_mit_putty.md
deleted file mode 100644
index dd93865db..000000000
--- a/doc.zih.tu-dresden.de/docs/access/ssh_mit_putty.md
+++ /dev/null
@@ -1,87 +0,0 @@
-# Prerequisites for Access to a Linux Cluster From a Windows Workstation
-
-To work at an HPC system at ZIH you need
-
-- a program that provides you a command shell (like
-  [PuTTY](http://www.chiark.greenend.org.uk/%7Esgtatham/putty/download.html)
-  or
-  [Secure Shell ssh3.2](http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/dienste/datennetz_dienste/secure_shell/);
-  both free) (The putty.exe is only to download at the desktop. (No installation))
-
-and if you would like to use graphical software from the HPC system
-
-- an X-Server (like [X-Ming](http://www.straightrunning.com/XmingNotes/)
-  or [CygWin32](http://www.cygwin.com/cygwin/)
-
-at your local PC. Here, you can find installation descriptions for the X servers:
-[X-Ming Installation](misc/install-Xming.pdf)
-
-[CygWin Installation](misc/cygwin_doku_de.pdf)
-
-Please note: You have also to install additional fonts for X-Ming at your PC. (also to find at
-[this website](http://www.straightrunning.com/XmingNotes/).  If you would like transfer files
-between your PC and an HPC machine, you should also have
-
-- [WinSCP](http://winscp.net/eng/docs/lang:de>) (an SCP program is also included in the
-  "Secure Shell ssh3.2" software; see above)
-
-installed at your PC.
-
-We advice putty + Xming (+ WinSCP).
-
-Please note: If you use software with OpenGL (like abaqus), please install "Xming-mesa" instead of
-"Xmin".
-
-After installation you have to start always at first the X-server. At the bottom right corner you
-will get an new icon (a black X for X-Ming).  Now you can start putty.exe. A window will appear
-where you have to give the name of the computer and you have to switch ON the "X11 forwarding".
-(please look at the figures)
-
-![PuTTY: Name of HPC System](misc/putty1.jpg)
-{: align="center"}
-
-![PuTTY: Switch on X11](misc/putty2.jpg)
-{: align="center"}
-
-<!--\<img alt="" src="%PUBURL%/Compendium/Login/putty1.jpg" title="putty:-->
-<!--name of HPC-machine" width="300" /> \<img alt=""-->
-<!--src="%PUBURL%/Compendium/Login/putty2.jpg" title="putty: switch on X11"-->
-<!--width="300" /> \<br />-->
-
-Now you can *Open* the connection. You will get a window from the remote machine, where you can put
-your Linux commands. If you would like to use commercial software, please follow the next
-instructions about the modules.
-
-## Copy Files from the HRSK Machines to Your Local Machine
-
-Take the following steps if your Workstation has a Windows operating system. You need putty (see
-above) and your favorite SCP program, in this example WinSCP.
-
-* Make a connection to `login1.zih.tu-dresden.de`
-
-![Tunnel 1](misc/tunnel1.png)
-{: align="center"}
-
-* Setup SSH tunnel (data from your machine port 1222 will be directed to deimos port 22)
-
-![Tunnel 2](misc/tunnel2.png)
-{: align="center"}
-
-* After clicking on the "Add" button, the tunnel should look like that
-
-![Tunnel 3](misc/tunnel3.png)
-{: align="center"}
-
-- Click "Open" and enter your login and password (upon successful login, the tunnel will exist)
-
-![Tunnel 4](misc/tunnel4.png)
-{: align="center"}
-
-- Put the putty window in the background (leave it running) and open  WinSCP (or your favorite SCP
-  program), connect to localhost:1222
-
-![Tunnel 5](misc/tunnel5.png)
-{: align="center"}
-
-- After hitting "Login" and entering your username/password, you can
-  access your files on deimos.
diff --git a/doc.zih.tu-dresden.de/mkdocs.yml b/doc.zih.tu-dresden.de/mkdocs.yml
index 96ac852f4..2fe845d67 100644
--- a/doc.zih.tu-dresden.de/mkdocs.yml
+++ b/doc.zih.tu-dresden.de/mkdocs.yml
@@ -9,13 +9,13 @@ nav:
   - Access to ZIH Systems:
     - Overview: access/overview.md
     - Connecting with SSH: access/ssh_login.md
-    - Key Fingerprints: access/key_fingerprints.md  
     - Desktop Visualization: access/desktop_cloud_visualization.md
     - Graphical Applications with WebVNC: access/graphical_applications_with_webvnc.md
-    - Security Restrictions: access/security_restrictions.md
     - JupyterHub:
       - JupyterHub: access/jupyterhub.md
       - JupyterHub for Teaching: access/jupyterhub_for_teaching.md
+    - Key Fingerprints: access/key_fingerprints.md  
+    - Security Restrictions: access/security_restrictions.md
   - Transfer of Data:
     - Overview: data_transfer/overview.md
     - Data Mover: data_transfer/data_mover.md
-- 
GitLab