diff --git a/ECMWF/README.md b/ECMWF/README.md
index 6e06c94b9a1b8ce1d8120ab5be0dde8911bdd503..bfa137101f08f70277825afa41abd19bb08b5f11 100644
--- a/ECMWF/README.md
+++ b/ECMWF/README.md
@@ -13,6 +13,10 @@ Available Services @ IMGW:
## Connecting to ECMWF Services
+???+ warning "Teleport supported versions"
+ Please note that ECMWF does currently only support teleport version up to 13. [ecmwf information](https://confluence.ecmwf.int/display/UDOC/Teleport+SSH+Access)
+
+
A ECMWF user can connect to the ECS/ATOS using teleport, first load the teleport module and start the ssh-agent:
```shell title="Using teleport"
@@ -57,7 +61,7 @@ Environment variables configuration:
You can set these variables in your `~/.bashrc` file to avoid typing these at every login. Please do not save your `ECMWF_PASSWORD` like this!
-It is highly advised to add this to your `.ssh/config`:
+It is highly advised to add this to your `.ssh/config`, although ECMWF has added some [information](https://confluence.ecmwf.int/display/UDOC/Teleport+SSH+Access+-+Linux+configuration) on that too:
```conf title=".ssh/config"
Host jump.ecmwf.int shell.ecmwf.int
diff --git a/Getting Started.md b/Getting Started.md
index e718fd93bc5cf920af6493a666f85d1d18f3cc09..d876954f033ab44ab45f490c4b2030d63a9ef952 100644
--- a/Getting Started.md
+++ b/Getting Started.md
@@ -11,7 +11,7 @@ Tasks to complete for newcomers, it is recommended that you print this page an t
- on Windows install a SSH-Client, e.g. Bitwise, MobaXterm, Putty,...
- [ ] Change your initial password with one of these options:
- browser ([https://wolke.img.univie.ac.at/ipa/ui](https://wolke.img.univie.ac.at/ipa/ui))
- - terminal `ssh [username]@srvx1.img.univie.ac.at`
+ - terminal `ssh [username]@login.img.univie.ac.at`
- [ ] Optional: [Create a ssh-key](./SSH-VPN-VNC/Questions.md#q-how-to-use-ssh-key-authentication) and add it to your profile on the [IPA](./SSH-VPN-VNC/IPA.md#add-ssh-key)
- [ ] Apply for your first [VSC Training course](https://vsc.ac.at/research/vsc-research-center/vsc-school-seminar/), e.g. Introduction to Working on the VSC Clusters
@@ -22,7 +22,7 @@ When you are new to using servers and linux, these few steps might help to get s
Steps:
- - [ ] login to srvx1 using ssh: `ssh [user]@srvx1.img.univie.ac.at` :earth_africa: [More on SRVX1](./Servers/SRVX1.md)
+ - [ ] login to srvx1 using ssh: `ssh [user]@login.img.univie.ac.at` :earth_africa: [More on AURORA](./Servers/Aurora.md)
- [ ] run: `userpaths` to understand where different data resides. e.g.
- HOME, SCRATCH (personal), DATA, SHARED, WEBDATA, ?_JET
- [ ] check available modules by running: `module av` and load anaconda3 module by running: `module load anaconda3`. This should allow you to run some python programs.
@@ -36,7 +36,6 @@ Please find a useful summary of commands in the [IMGW cheatsheet](./mkdocs/imgw-
The Department of Meteorology and Geophysics has access to the following computing resources:
- Teaching and Development Server ([SRVX1](Servers/SRVX1.md))
-- Remote Desktop Server ([SRVX8](Servers/SRVX8.md))
- Development Server ([Aurora](Servers/Aurora.md))
- Computing Cluster ([JET](Servers/JET.md))
- Vienna Scientific Cluster ([VSC](VSC.md))
diff --git a/Misc/README.md b/Misc/README.md
index c683ad4fff97802acc5d759f4268bccfcbd63bfe..c6383182966d0a59684d26f84d7b2dbd616fc559 100644
--- a/Misc/README.md
+++ b/Misc/README.md
@@ -12,10 +12,26 @@ The main files to make your shell unique is to edit two files:
Please find examples of these two files here [bashrc](./bashrc) [inputrc](./inputrc). Please adjust these files to your needs. Some parts are only available on special systems.
+One can also jsut download the user shell initial script:
+
+```sh title="Deploy user shell customizations"
+# download and execute
+$ wget -O- https://webdata.wolke.img.univie.ac.at/scratch/deploy/setup_user_bash_one.sh | sh
+# find two addtions to your .bashrc
+
+if [ -f $HOME/.imgw_bashrc ]; then
+ . $HOME/.imgw_bashrc
+fi
+if [ -f $HOME/.imgw_alias ]; then
+ . $HOME/.imgw_alias
+fi
+# a new .inputrc
+```
+
## Q: How to extract a table from a PDF?
-There is a tool for investigative reporting at news organizations, that developed this tool. [Got to tabula](https://tabula.technology/)
+There is a tool for investigative reporting at news organizations, that developed this tool. [Go to tabula](https://tabula.technology/)
### How to Use Tabula
diff --git a/SSH-VPN-VNC/IPA.md b/SSH-VPN-VNC/IPA.md
index fe5a64fadba3329542516f375a6ffb719265beae..c38d27f7fd5b032d0213201d87eb137e9651f85b 100644
--- a/SSH-VPN-VNC/IPA.md
+++ b/SSH-VPN-VNC/IPA.md
@@ -17,7 +17,7 @@ A new password must use at least 2 of the following classes:
**Minimum** length is **8**, password **history** is **4**. The minimum **lifetime** of a password is **1 hour**.
### SSH Login
-Please use the given credentials (*username, first-time password*) and login to e.g. *srvx1.img.univie.ac.at*:
+Please use the given credentials (*username, first-time password*) and login to e.g. *login.img.univie.ac.at*:
diff --git a/SSH-VPN-VNC/Questions.md b/SSH-VPN-VNC/Questions.md
index 1ffdd46628100515d208b82ce38e8a4c415f3b9a..8e58c2f301a37364ddae07a751f7deeef9ffed5d 100644
--- a/SSH-VPN-VNC/Questions.md
+++ b/SSH-VPN-VNC/Questions.md
@@ -178,13 +178,13 @@ $ rsync -avz -r --stats --progress -e "ssh gateway ssh" remote:/src/documents/ /
**Note: key-based authentication is required from the gateway to the remote server using rsync.**
Initial testing showed that using key-based authentication between gateway and remote is required.
-## Q: How to connect to Jet, SRVX8, SRVX2?
+## Q: How to connect to Jet, Aurora?
-Currently (01.2021) only `srvx1.img.univie.ac.at` and `login.univie.ac.at` are available from the internet.
+Currently there is only `login.img.univie.ac.at` available from the internet.
Please replace `[USER]` with your username on these servers and adjust the servers to your needs.
```bash
-$ ssh -t [USER]@srvx1.img.univie.ac.at 'ssh [USER]@jet01.img.univie.ac.at'
+$ ssh -t [USER]@login.img.univie.ac.at 'ssh [USER]@jet01.img.univie.ac.at'
```
or using the above `~/.ssh/config` you can do:
@@ -207,7 +207,7 @@ You can use the `mountserver` ([Download: mountserver](mountserver)) script to d
```bash
$ mountserver [remote] [remote directory] [local directory]
# example
-$ mountserver srvx1 /raid61/wetter /home/monkey/srvx1
+$ mountserver login /srvfs/home/[user] /home/monkey/srvx1
```
This will mount the remote directory to the local directory. The local directory will be created if it does not exist. The directory should be empty before mounting, otherwise that will cause problems.
@@ -224,10 +224,10 @@ based on a tutorial from [Linuxize](https://linuxize.com/post/how-to-setup-ssh-s
It can be really useful to access resources from inside the IMGW / UNIVIE network without using the VPN from the ZID. This can be done super easily. You need an SSH client (e.g. ssh, Putty) and [Firefox](https://www.mozilla.org/en-US/firefox/new/).
-I'm showing the things here only for Linux, but Windows with Putty should be straight forward too. Connect to SRVX1 for example:
+I'm showing the things here only for Linux, but Windows with Putty should be straight forward too. Connect to Aurora for example:
```bash
-ssh -N -D 8091 [USER]@srvx1.img.univie.ac.at
+ssh -N -D 8091 [USER]@login.img.univie.ac.at
```
Options:
diff --git a/SSH-VPN-VNC/README.md b/SSH-VPN-VNC/README.md
index 5a874fe6420c5caa2f6bf5d31265fdd2a156ec51..d644b3c813cd5b9fdf088faceeca4bccfee23c33 100644
--- a/SSH-VPN-VNC/README.md
+++ b/SSH-VPN-VNC/README.md
@@ -14,8 +14,9 @@ Please use these methods to access the servers:
Currently, there are two JupyterHub instances runnning:
-- TeachingHub on SRVX1
-- ResearchHub on Jet01
+- TeachingHub on [SRVX1](https://teaching.wolke.img.univie.ac.at)
+- MasterHub on [SRVX1](https://quell.wolke.img.univie.ac.at)
+- ResearchHub on [jet](https://jupyter.wolke.img.univie.ac.at)
Connect to either via the [wolke](https://wolke.img.univie.ac.at)
diff --git a/SSH-VPN-VNC/SSH.md b/SSH-VPN-VNC/SSH.md
index 19aedade1a9889d54f9fc694a7661d9440bf31c9..00e07e9daa3d6b904936b7c8071ac4b29d9d4657 100644
--- a/SSH-VPN-VNC/SSH.md
+++ b/SSH-VPN-VNC/SSH.md
@@ -17,8 +17,7 @@ on Linux and Mac, all tools are present. on Windows use one of these:
**Connect from the office** by typing either of the following in a terminal. Replace `[USERNAME]` with your own.
```bash title="ssh connections"
-ssh [USERNAME]@srvx1.img.univie.ac.at
-ssh [USERNAME]@srvx8.img.univie.ac.at
+ssh [USERNAME]@login.img.univie.ac.at
ssh [USERNAME]@aurora.img.univie.ac.at
ssh [USERNAME]@jet01.img.univie.ac.at
ssh [USERNAME]@jet02.img.univie.ac.at
@@ -36,71 +35,33 @@ Host *
ServerAliveInterval 60
ServerAliveCountMax 2
-Host srvx1
- HostName srvx1.img.univie.ac.at
+Host login
+ HostName aurora.img.univie.ac.at
-Host srvx8
- HostName srvx8.img.univie.ac.at
+Host aurora
+ HostName aurora.img.univie.ac.at
Host jet
HostName jet01.img.univie.ac.at
-Host srvx2jet
+Host login2jet
HostName jet01.img.univie.ac.at
- ProxyJump srvx1.img.univie.ac.at
-Host login
- HostName login.univie.ac.at
- User [U:Account USERNAME]
-Host ecaccess
- Host ecaccess.ecmwf.int
- HostKeyAlgorithms ssh-dss
- User [ECMWF USERNAME]
- KexAlgorithms diffie-hellman-group1-sha1
- Ciphers aes256-cbc
-Host jump.ecmwf.int shell.ecmwf.int
- HostKeyAlgorithms +ssh-rsa*,rsa-sha2-512
- PubkeyAcceptedKeyTypes +ssh-rsa*
- User [ECMWF USERNAME]
-# For ecgate and Cray HPCF
-Host ecg* cc*
- HostKeyAlgorithms +ssh-rsa*,rsa-sha2-512
- PubkeyAcceptedKeyTypes +ssh-rsa*
- User [ECMWF USERNAME]
- ProxyJump shell.ecmwf.int
-# For Atos HPCF
-Host a?-* a??-* hpc-* hpc2020-* ecs-*
- HostKeyAlgorithms +ssh-rsa*,rsa-sha2-512
- PubkeyAcceptedKeyTypes +ssh-rsa*
- User [ECMWF USERNAME]
- ProxyJump jump.ecmwf.int
+ ProxyJump login.img.univie.ac.at
+
```
-and replacing `[USERNAME]` and `[u:account USERNAME]` with your usernames. Using such a file allows to connect like this `ssh srvx1` using the correct server adress and specified username. Copy this file as well on `login.univie.ac.at` and you can use commands like this: `ssh -t login ssh jet` to connect directly to `jet` via the `login` gateway.
+and replacing `[USERNAME]` with your username. Using such a file allows to connect like this `ssh login` using the correct server adress and specified username.
Please note the special algorithms for ecaccess and of course ECMWF uses [teleport](../ECMWF/README.md#connecting-to-ecmwf-services) now.
**From eduroam**: You should be able to log in as above.
-**From the outer world**: use the [VPN](VPN.md) or `srvx1.img.univie.ac.at` as jump host.
+**From the outer world**: use the [VPN](VPN.md) or `login.img.univie.ac.at` as jump host.
If you are a guest, you can apply for a [guest u:account](https://zid.univie.ac.at/en/uaccount/#c14154). This will give you access to eduroam and to the VPN. Your application needs to be endorsed by a staff member, who also determines the expiration date of the account. **Please ask the sponsor first!**
## SSH Authentication with keys
-If you want to use ssh-keys you can also use different keys in `.ssh/config` per server with `IdentityFile ~/.ssh/id_enc_for_server`.
-
-**Note: If you are having trouble with your ssh-key being accepted. You need to check the selinux security policy. Because we use non standard home directories, which are not accepted by default.** Do that by running:
-
-```bash
-ls -ldZ ~/.ssh/
-drwx------. 2 monkey users system_u:object_r:ssh_home_t:s0 4.0K Aug 18 21:24 .ssh/
-
-ls -lZ ~/.ssh/
--rw-------. 1 monkey users unconfined_u:object_r:ssh_home_t:s0 1.3K Aug 17 10:58 authorized_keys
-```
-
-If you are not seeing `ssh_home_t` than you need to run `restorecon -Rv ~/.ssh/` which should update the security policy and allow for the SSH-Daemon to accept your keys.
-
**Please add your ssh-keys via [IPA](IPA.md#add-ssh-key)**
Find a solution [Questions - How to use ssh-key authentication?](Questions.md#q-how-to-use-ssh-key-authentication) or [Questions - How to use an ssh-agent?](Questions.md#q-how-to-use-an-ssh-agent)
@@ -108,7 +69,7 @@ Find a solution [Questions - How to use ssh-key authentication?](Questions.md#q-
## Connect Script
If you are using a terminal (Mac, Linux, WSL, ...) you can use the script [Download: connect2jet](./connect2jet) like this:
```bash
-connect2jet -g [U:Account-Username]@login.univie.ac.at [Jet-Username]@jet01.img.univie.ac.at
+connect2jet -g [Username]@login.img.univie.ac.at [Username]@jet01.img.univie.ac.at
```
??? note "connect2jet"
@@ -120,9 +81,9 @@ connect2jet -g [U:Account-Username]@login.univie.ac.at [Jet-Username]@jet01.img.
There is also an option to forward a port, e.g. the VNC Port:
```bash
-connect2jet -g [U:Account-Username]@login.univie.ac.at -p 5901 [Jet-Username]@jet01.img.univie.ac.at
+connect2jet -g [Username]@login.img.univie.ac.at -p 5901 [Username]@jet01.img.univie.ac.at
```
-which allows you to connect to `localhost:5901` and view the VNC session. Other gateway servers can be `srvx1.img.univie.ac.at`
+which allows you to connect to `localhost:5901` and view the VNC session. Other gateway servers can be `login.img.univie.ac.at`
## Tunneling
@@ -136,7 +97,7 @@ On Linux, start [Remmina](https://remmina.org/), then:
On Windows, you can use [Bitvise SSH Client](https://www.bitvise.com/ssh-client-download) (for the SSH tunnel) and the [RealVNC VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/windows/) or [MobaXterm](https://mobaxterm.mobatek.net).
-Setup might be bit different for different clients, but all need these informationÖ
+Setup might be bit different for different clients, but all need these information:
Option Bitvise SSH Client/MobaXterm and RealVNC:
@@ -148,29 +109,25 @@ Option Bitvise SSH Client/MobaXterm and RealVNC:
* Set "Destination Port" to `5900+[DISPLAY]`
* Now start VncViewer and connect to `127.0.0.1:5900+[DISPLAY]`
+on Linux that is really simple:
+
+```sh title="ssh port forwarding"
+# REMOTEPORT -> to LOCALPORT
+ssh LOCALPORT:localhost:REMOTEPORT USER@login
+# connect to the local port
+```
+
## SSHFS
It is possible to mount your home directory to your personal computer on Linux via `sshfs` or using of course a dedicated remote file browser like: Filezilla, Cyberduck, ...
on Linux you need to install `fuse2` and `sshfs`, the names might vary between distributions, but are all in the default repos.
```bash
-# connect to srvx1 using your home directory and a srvx1 directory on your local computer
+# connect to srvx1 using your home directory and a login directory on your local computer
# mountserver [host] [remotedir] [localdir]
-mkdir -p $HOME/srvx1
-mountserver [USER]@srvx1.img.univie.ac.at /users/staff/[USER] $HOME/srvx1
+mkdir -p $HOME/login
+mountserver [USER]@login.img.univie.ac.at /srvfs/home/[USER] $HOME/srvx1
```
-Note the directories might vary, depending on your membership (staff, external, students).
-
-## MOSH
-Remote terminal application that allows roaming, supports intermittent connectivity, and provides intelligent local echo and line editing of user keystrokes.
-Mosh is a replacement for interactive SSH terminals. It's more robust and responsive, especially over Wi-Fi, cellular, and long-distance links.
-
-In order to use:
-- install on your client, [instructions](https://mosh.org/#getting)
-
-```bash
-$ mosh user@srvx1.img.univie.ac.at
-```
## SSH Banner
If you login in to any of the IMGW Servers you will be greeted by a banner showing some information about the system. However, after some time you might not need that information anymore.
diff --git a/SSH-VPN-VNC/VNC.md b/SSH-VPN-VNC/VNC.md
index ec766d0c24d131f3848682d29e957973df108191..78efabe8c859c63b7fbef62894eaa5b5aef9e702 100644
--- a/SSH-VPN-VNC/VNC.md
+++ b/SSH-VPN-VNC/VNC.md
@@ -9,9 +9,8 @@ The VNC (Virtual Network Computing) allows to view a graphical user interface (G
Xvnc is the Unix VNC server. Applications can display themselves on Xvnc as if it were a normal display, but they will appear on any connected VNC viewers rather than on a physical screen. The VNC protocol uses the TCP/IP ports 5900+N, where N is the display number.
Currently VNC is installed on:
-- SRVX8 [staff]
-- JET01 [staff]
-- AURORA [staff]
+- JET01
+- AURORA
## Userservices
@@ -45,55 +44,21 @@ Installed Desktops: icewm-session
Running the script without any options will run all necessary steps. In case of error try removing your `.vnc` directory, as older configurations might be in the way. There shall be at least two desktop options: icewm and xfce. You can specify this directly with the `-w [DESKTOP]` option.
-## Setup - Manual
+### Connecting
-Please consider using the `userservices vnc` script to do this setup.
-
-First of all check if a VNC server is already running or not. Depending on the results you have two options:
-
-1. Use an existing. (Note the Port/Display Number)
-2. Stop all and start a new VNC server
-3. **on Jet** setup a service running your VNC Server.
-
-```bash
-# Check VNC Server directly, lists available with DISPLAY/PORT
-vncserver -list
-
-# Check for processes:
-ps ux | grep Xvnc
-
-# Kill a VNC Display
-vncserver -kill :[DISPLAY]
-
-# Start a new VNC Server
-vncserver
-```
-
-### Jet Cluser
-
-on Jet there are the user services available to you:
-
-```bash
-# Help information on VNC userservice
-userservices vnc -h
-```
-
-if you have never used this script or a `vncserver` just running `userservices vnc` will be enough for you to setup the VNC service. It will tell you which port you have been automatically assigned.
-
-
-### Connecting, setting the window manager
-
-Use a VNC client (e.g. [TigerVNC Viewer](https://sourceforge.net/projects/tigervnc/files/stable/) (All OS) or [RealVNC VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/windows/) on Windows, or [Remmina](https://remmina.org/) on any Linux distribution) and connect to `srvx?.img.univie.ac.at:[DISPLAY]`.
+Use a VNC client (e.g. [TigerVNC Viewer](https://sourceforge.net/projects/tigervnc/files/stable/) (All OS) or [RealVNC VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/windows/) on Windows, or [Remmina](https://remmina.org/) on any Linux distribution) and connect to `login.img.univie.ac.at:[DISPLAY]`.
**Note: Since version 1.10 of tigerVNC it is possible to resize the windows directly**
Connect with a viewer:
-1. Hostname: `srvx1.img.univie.ac.at` or `jet01.img.univie.ac.at`
-2. VNC Port: `vncserver -list` or `systemctl status --user vncserver.slice`
-3. VNC passwort (`vncpasswd` allows to set this on the server)
+1. Hostname: `login.img.univie.ac.at` or `jet01.img.univie.ac.at`
+2. VNC Port: `userservices vnc`, but do not stop the server. Just get the port of a running server.
+
-The VNC server will automatically start a graphical window manager/desktop environment. Details are stored in `.vnc/xstartup`. Your default configuration will load GNOME, and `.vnc/xstartup` will be something like this:
+### Setting a window manager
+
+This is more advanced. The VNC server will automatically start a graphical window manager/desktop environment. Details are stored in `.vnc/xstartup`. Your default configuration will load GNOME, and `.vnc/xstartup` will be something like this:
```bash
#!/bin/sh
@@ -124,53 +89,6 @@ icewm &
Some information on what could be put into `.Xresources` is given [here](https://wiki.archlinux.org/title/x_resources). It might be possible to replace `icewm` here with `startxfce4` to choose XFCE Desktop environment.
-### VNC as a Service
-This is only here for reference, on SRVX2 and Jet use the `userservices vnc`.
-
-Setup, replace `[DISPLAY]` with an appropriate number, e.g. `3`:
-
-```bash
-mkdir -p ~/.config/systemd/user
-cp /usr/lib/systemd/user/vncserver@.service ~/.config/systemd/user/
-systemctl --user daemon-reload
-vncpasswd
-systemctl --user enable vncserver@:[DISPLAY].service --now
-loginctl enable-linger
-```
-
-Finally stop/restart the VNC server.
-
-```bash
-# Restart
-systemctl --user restart vncserver@:[DISPLAY].service --now
-# Stop
-systemctl --user stop vncserver@:[DISPLAY].service --now
-# Disable Service
-systemctl --user disable vncserver@:[DISPLAY].service --now
-# Enable Service
-systemctl --user enable vncserver@:[DISPLAY].service --now
-```
-
-Monitor the status:
-
-```bash
-# Like this
-systemctl --user status vncserver@:[DISPLAY].service
-# or
-systemctl --user status vncserver.slice
-
- vncserver@:7.service - Remote desktop service (VNC)
- Loaded: loaded (/jetfs/home/mblaschek/.config/systemd/user/vncserver@.service; enabled; vendor preset: e>
- Active: active (running) since Mon 2020-10-05 17:00:23 CEST; 3 months 8 days ago
- CGroup: /user.slice/user-54212.slice/user@54212.service/vncserver.slice/vncserver@:7.service
- ├─ 32405 gpg-agent --homedir /root/.emacs.d/elpa/gnupg --use-standard-socket --daemon
- ├─ 59959 /usr/bin/gnome-keyring-daemon --start --foreground --components=secrets
- ├─ 116498 /usr/lib64/firefox/firefox -contentproc -childID 47 -isForBrowser -prefsLen 10637 -pre>
- ├─ 177114 /bin/sh /usr/bin/xdg-open about:blank
- ├─ 177225 /usr/lib64/firefox/firefox about:blank
-...
-```
-
## Change the resolution of your VNC Session
`xrandr` gives you a list of available resolutions, that can be use. Requires a `$DISPLAY` variable to be set, using your VNC display number does the trick, e.g. `:3`.
diff --git a/Servers/JET.md b/Servers/JET.md
index 77601f7bf0723f0a99ecc1d88c6f3dfd59629561..fabcf800364a78b4286e0df0f2bc2305c9b419ad 100644
--- a/Servers/JET.md
+++ b/Servers/JET.md
@@ -21,12 +21,12 @@ Steps:
## System Information
-Last Update: 29.01.2024
+Last Update: 16.07.2024
Node Setup:
- 2x Login Nodes (jet01, jet02)
- - 7x Compute Nodes (jet03-09)
+ - 17x Compute Nodes (jet03-19)
- 5x Storage Nodes
diff --git a/mkdocs/img/IMGW-connection-diagram.dot b/mkdocs/img/IMGW-connection-diagram.dot
index 6fe7c8c64523ae2daa47820afd130332115a780c..4757550b2c4bf9649b1976caa270fa373e360392 100644
--- a/mkdocs/img/IMGW-connection-diagram.dot
+++ b/mkdocs/img/IMGW-connection-diagram.dot
@@ -1,21 +1,20 @@
digraph Servers {
bgcolor="transparent"
- users [shape=none image="student_sm.png" label="User" labelloc="b" height="1" imagepos="tc"]
- srvx1 [shape=none image="server_sm.png" label="SRVX1" labelloc="b" height="1" imagepos="tc"]
- srvx8 [shape=none image="server_sm.png" label="SRVX8" labelloc="b" height="1" imagepos="tc"]
- aurora [shape=none image="server_sm.png" label="AURORA" labelloc="b" height="1" imagepos="tc"]
- jet [shape=none image="server_sm.png" label="JET" labelloc="b" height="1" imagepos="tc"]
- VPN [shape=none image="local-area-network_sm.png" label="VPN" labelloc="b" height="1" imagepos="tc"]
- vsc [shape=none image="logo_vsc_sm.png" label="VSC" labelloc="b" height=".8" imagepos="tc"]
+ node [shape=none labelloc="b" height="1" imagepos="tc"]
- users -> srvx1
+ users [image="student_sm.png" label="User"]
+ login [image="server_sm.png" label="login"]
+ aurora [image="server_sm.png" label="AURORA"]
+ jet [image="server_sm.png" label="JET"]
+ VPN [image="local-area-network_sm.png" label="VPN"]
+ vsc [image="logo_vsc_sm.png" label="VSC" height=".8"]
+
+ users -> login
users -> VPN
- srvx1 -> srvx8
- srvx1 -> jet
- srvx1 -> aurora
- srvx1 -> vsc
+ login -> jet
+ login -> aurora
+ login -> vsc
VPN -> jet
- VPN -> srvx8
VPN -> aurora
VPN -> vsc
}
\ No newline at end of file
diff --git a/mkdocs/img/IMGW-connection-diagram.png b/mkdocs/img/IMGW-connection-diagram.png
index 6f594b6c585d1f95e1763f39b98e1cd255820687..d335747c70e6f440ed22f4153347878bed5b41ad 100644
Binary files a/mkdocs/img/IMGW-connection-diagram.png and b/mkdocs/img/IMGW-connection-diagram.png differ
diff --git a/mkdocs/img/IMGW-connection-diagram2.dot b/mkdocs/img/IMGW-connection-diagram2.dot
index 0cd0c30bfa61009c615deefdf111674c89252613..861cd5eba8767726470da5fcea6df53dc3f66112 100644
--- a/mkdocs/img/IMGW-connection-diagram2.dot
+++ b/mkdocs/img/IMGW-connection-diagram2.dot
@@ -1,14 +1,10 @@
digraph Servers {
bgcolor="transparent"
users [shape=none image="student_sm.png" label="User" labelloc="b" height="1" imagepos="tc"]
- srvx1 [shape=none image="server_sm.png" label="SRVX1" labelloc="b" height="1" imagepos="tc"]
- srvx8 [shape=none image="server_sm.png" label="SRVX8" labelloc="b" height="1" imagepos="tc"]
jet [shape=none image="server_sm.png" label="JET" labelloc="b" height="1" imagepos="tc"]
aurora [shape=none image="server_sm.png" label="AURORA" labelloc="b" height="1" imagepos="tc"]
vsc [shape=none image="logo_vsc_sm.png" label="VSC" labelloc="b" height=".8" imagepos="tc"]
- users -> srvx1
- users -> srvx8
users -> jet
users -> vsc
users -> aurora
diff --git a/mkdocs/img/IMGW-connection-diagram2.png b/mkdocs/img/IMGW-connection-diagram2.png
index 8ccd5f0fb1cd4c055882e1533f20d4c0d96c99cd..7ae0f4741857ee6843de249d6be8629bc7756976 100644
Binary files a/mkdocs/img/IMGW-connection-diagram2.png and b/mkdocs/img/IMGW-connection-diagram2.png differ
diff --git a/mkdocs/img/jet-gpfs-setup.dot b/mkdocs/img/jet-gpfs-setup.dot
index f202450a1dd8500c9564b6a22875fb58bada1255..86d88803c95962c18ae97682d3162399ce4232fb 100644
--- a/mkdocs/img/jet-gpfs-setup.dot
+++ b/mkdocs/img/jet-gpfs-setup.dot
@@ -17,10 +17,7 @@ digraph Servers {
style="rounded,dotted";
}
subgraph cluster_COMPUTE {
- {rank=same jet03; jet04;}
- {rank=same jet05; jet06;}
- {rank=same jet07; jet08; jet09;}
- jet03 -> jet05 -> jet07 [style=invis]
+ jet03 -> jet19 [style=invis]
label="Computing Nodes /jetfs";
bgcolor="#0063a6";
style="rounded,dotted";
@@ -32,7 +29,7 @@ digraph Servers {
# style="rounded,dotted";
#}
edge [constraint=false]
- jet02 -> jet07 [lhead=cluster_COMPUTE ltail=cluster_LOGIN arrowhead=none];
+ jet02 -> jet19 [lhead=cluster_COMPUTE ltail=cluster_LOGIN arrowhead=none];
label="Global parallel file system (GPFS) JETFS";
bgcolor="#11897a";
labelloc=t;
diff --git a/mkdocs/img/jet-gpfs-setup.png b/mkdocs/img/jet-gpfs-setup.png
index a296b8c2d5872989d9c87576c0e0a62c8d275a91..e137bb592ef5d3c2cbacf374bf1ef72c21c3e278 100644
Binary files a/mkdocs/img/jet-gpfs-setup.png and b/mkdocs/img/jet-gpfs-setup.png differ
diff --git a/mkdocs/img/server_sm.png b/mkdocs/img/server_sm.png
index b84602d6db5e0416af3fb4f45adf19e6404b43a6..2c80de8675b9fb48063bdc52770d9f04b982a04e 100644
Binary files a/mkdocs/img/server_sm.png and b/mkdocs/img/server_sm.png differ