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

further fixes

Browse Source
This commit is contained in:
viessm_h
2025-12-16 11:21:18 +01:00
parent 01ac18b3f4
commit 581b695839
12 changed files with 25 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/merlin7/02-How-To-Use-Merlin/archive.md
View File

@@ -66,7 +66,7 @@ Below are the main steps for using the Data Catalog.
Since large data sets may take a lot of time to transfer, some steps are designed to happen in the
background. The discovery website can be used to track the progress of each step.
### Account Registration
### Account Registration
Two types of account permit access to the Data Catalog. If your data was collected at a ***beamline***, you may
have been assigned a **``p-group``** (e.g. ``p12345``) for the experiment. Other users are assigned **``a-group``**
@@ -75,7 +75,7 @@ have been assigned a **``p-group``** (e.g. ``p12345``) for the experiment. Other
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 Merlin7
**[Requesting extra Unix groups](../01-Quick-Start-Guide/requesting-accounts.md#requesting-extra-unix-groups)** procedure, or open
**[Requesting extra Unix groups](../01-Quick-Start-Guide/requesting-accounts.md)** procedure, or open
a **[PSI Service Now](https://psi.service-now.com/psisp)** ticket.
### Documentation
@@ -102,7 +102,7 @@ As of 2022-04-14 a secure token is required to interact with the data catalog. T
1. You should be redirected to your user settings and see a 'User Information' section. If not, click on1. your username in the top right and choose 'Settings' from the menu.
1. Look for the field 'Catamel Token'. This should be a 64-character string. Click the icon to copy the1. token.
![SciCat website](/images/scicat_token.png)
![SciCat website](../../images/scicat_token.png)
You will need to save this token for later steps. To avoid including it in all the commands, I suggest saving it to an environmental variable (Linux):

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

@@ -7,7 +7,7 @@ PuTTY is one of the most common tools for SSH.
Check, if the following software packages are installed on the Windows workstation by
inspecting the *Start* menu (hint: use the *Search* box to save time):
* PuTTY (should be already installed)
* *[Optional]* Xming (needed for [SSH with X11 Forwarding](connect-from-windows.md#ssh-with-x11-forwarding))
* *[Optional]* Xming (needed for [SSH with X11 Forwarding](#ssh-with-putty-with-x11-forwarding))
If they are missing, you can install them using the Software Kiosk icon on the Desktop.

18
docs/merlin7/02-How-To-Use-Merlin/merlin-rmount.md
View File

@@ -1,14 +1,4 @@
---
title: Using merlin_rmount
#tags:
keywords: >-
transferring data, data transfer, rsync, dav, webdav, sftp, ftp, smb, cifs,
copy data, copying, mount, file, folder, sharing
last_updated: 24 August 2023
#summary: ""
sidebar: merlin7_sidebar
permalink: /merlin7/merlin-rmount.html
---
# Using merlin_rmount
## Background
@@ -47,7 +37,7 @@ merlin_rmount --select-mount
Select the desired url using the arrow keys.
![merlin_rmount --select-mount](/images/rmount/select-mount.png)
![merlin_rmount --select-mount](../../images/rmount/select-mount.png)
From this list any of the standard supported endpoints can be mounted.
@@ -55,7 +45,7 @@ From this list any of the standard supported endpoints can be mounted.
Other endpoints can be mounted using the `merlin_rmount --mount <endpoint>` command.
![merlin_rmount --mount](/images/rmount/mount.png)
![merlin_rmount --mount](../../images/rmount/mount.png)
### Accessing Files
@@ -95,7 +85,7 @@ Disconnecting will unmount all volumes.
Users that prefer a GUI file browser may prefer the `thunar` command, which opens the Gnome File Browser. This is also available in NoMachine sessions in the bottom bar (1). Thunar supports the same remote filesystems as `merlin_rmount`; just type the URL in the address bar (2).
![Mounting with thunar](/images/rmount/thunar_mount.png)
![Mounting with thunar](../../images/rmount/thunar_mount.png)
When using thunar within a NoMachine session, file transfers continue after closing NoMachine (as long as the NoMachine session stays active).