HPCE/gitea-pages
0
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Activity

further vibing #2

Browse Source
This commit is contained in:
viessm_h
2025-12-11 11:04:12 +01:00
parent f09acd4fc7
commit 84f9846a0c
22 changed files with 51 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/merlin7/02-How-To-Use-Merlin/connect-from-windows.md
View File

@@ -15,11 +15,11 @@ If they are missing, you can install them using the Software Kiosk icon on the D
2. *[Optional]* Enable ``xterm`` to have similar mouse behavour as in Linux:
![Enable 'xterm']({{ "/images/PuTTY/Putty_Mouse_XTerm.png" }})
![Enable 'xterm'](../../images/PuTTY/Putty_Mouse_XTerm.png)
3. Create session to a Merlin login node and *Open*:
![Create Merlin Session]({{ "/images/PuTTY/Putty_Session.png" }})
![Create Merlin Session](../../images/PuTTY/Putty_Session.png)
## SSH with PuTTY with X11 Forwarding
@@ -37,4 +37,4 @@ using the Software Kiosk icon (should be located on the Desktop).
2. Enable X11 Forwarding in your SSH client. In example, for Putty:
![Enable X11 Forwarding in Putty]({{ "/images/PuTTY/Putty_X11_Forwarding.png" }})
![Enable X11 Forwarding in Putty](../../images/PuTTY/Putty_X11_Forwarding.png)

8
docs/merlin7/02-How-To-Use-Merlin/nomachine.md
View File

@@ -83,12 +83,12 @@ The NoMachine client can be downloaded from [NoMachine's download page](https://
- **Port**: Enter `4000`.
- **Protocol**: Select `NX`.
![Create New NoMachine Connection]({{ "/images/NoMachine/screen_nx_address.png" }})
![Create New NoMachine Connection](../../images/nomachine/screen_nx_address.png)
- On the **Configuration** tab ensure:
- **Authentication**: Select `Use password authentication`.
![Create New NoMachine Connection]({{ "/images/NoMachine/screen_nx_configuration.png" }})
![Create New NoMachine Connection](../../images/nomachine/screen_nx_configuration.png)
- Click the **Add** button to finish creating the new connection.
@@ -96,7 +96,7 @@ The NoMachine client can be downloaded from [NoMachine's download page](https://
When prompted, use your PSI credentials to authenticate.
![Create New NoMachine Connection]({{ "/images/NoMachine/screen_nx_auth.png" }})
![Create New NoMachine Connection](../../images/nomachine/screen_nx_auth.png)
## Managing Sessions
@@ -120,7 +120,7 @@ Access to the login node desktops must be initiated through the `merlin7-nx.psi.
When connecting to the `merlin7-nx.psi.ch` front-end, a new session automatically opens if no existing session is found. Users can manage their sessions as follows:
- **Reconnect to an Existing Session**: If you have an active session, you can reconnect to it by selecting the appropriate icon in the NoMachine client interface. This allows you to resume work without losing any progress.
![Open an existing Session]({{ "/images/NoMachine/screen_nx_single_session.png" }})
![Open an existing Session](../../images/nomachine/screen_nx_single_session.png)
- **Create a Second Session**: If you require a separate session, you can select the **`New Desktop`** button. This option creates a second session on another login node, provided the node is available and operational.
### Session Management Considerations