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

2
docs/merlin6/how-to-use-merlin/archive.md
View File

@@ -70,7 +70,7 @@ collected at a ***beamline***, you may have been assigned a **`p-group`**
Groups are usually assigned to a PI, and then individual user accounts are added to the group. This must be done
under user request through PSI Service Now. For existing **a-groups** and **p-groups**, you can follow the standard
central procedures. Alternatively, if you do not know how to do that, follow the Merlin6
**[Requesting extra Unix groups](../../quick-start-guide/requesting-accounts.md#requesting-extra-unix-groups)** procedure, or open
**[Requesting extra Unix groups](../quick-start-guide/requesting-accounts.md)** procedure, or open
a **[PSI Service Now](https://psi.service-now.com/psisp)** ticket.
### Documentation

6
docs/merlin6/how-to-use-merlin/connect-from-windows.md
View File

@@ -22,11 +22,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
@@ -44,4 +44,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)

6
docs/merlin6/how-to-use-merlin/transfer-data.md
View File

@@ -28,7 +28,7 @@ visibility.
## Direct transfer via Merlin6 login nodes
The following methods transfer data directly via the [login
nodes](../../quick-start-guide/accessing-interactive-nodes.md#login-nodes-hardware-description). They are suitable
nodes](../quick-start-guide/accessing-interactive-nodes.md). They are suitable
for use from within the PSI network.
### Rsync
@@ -72,7 +72,7 @@ The purpose of the software is to send a large file to someone, have that file a
From August 2024, Merlin is connected to the **[PSI Data Transfer](https://www.psi.ch/en/photon-science-data-services/data-transfer)** service,
`datatransfer.psi.ch`. This is a central service managed by the **[Linux team](https://linux.psi.ch/index.html)**. However, any problems or questions related to it can be directly
[reported](../../99-support/contact.md) to the Merlin administrators, which will forward the request if necessary.
[reported](../99-support/contact.md) to the Merlin administrators, which will forward the request if necessary.
The PSI Data Transfer servers supports the following protocols:
* Data Transfer - SSH (scp / rsync)
@@ -167,4 +167,4 @@ provides a helpful wrapper over the Gnome storage utilities, and provides suppor
- [others](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/using_the_desktop_environment_in_rhel_8/managing-storage-volumes-in-gnome_using-the-desktop-environment-in-rhel-8#gvfs-back-ends_managing-storage-volumes-in-gnome)
[More instruction on using `merlin_rmount`](merlin-rmount.md)
[More instruction on using `merlin_rmount`](../software-support/merlin-rmount.md)