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

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

@@ -97,7 +97,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):

4
docs/merlin6/how-to-use-merlin/kerberos.md
View File

@@ -50,7 +50,7 @@ klist
krenew
```
* Keep in mind that the maximum lifetime for granting tickets is 7 days, therefore `krenew` can not be used beyond that limit,
and then `kinit** should be used instead.
and then `kinit` should be used instead.
## Obtanining granting tickets with keytab
@@ -101,7 +101,7 @@ aklog
## Slurm jobs accessing AFS
Some jobs may require to access private areas in AFS. For that, having a valid [**keytab**](#generating-granting-tickets-with-keytab) file is required.
Some jobs may require to access private areas in AFS. For that, having a valid [**keytab**](#obtaining-granting-tickets-with-username-and-password) file is required.
Then, from inside the batch script one can obtain granting tickets for Kerberos and AFS, which can be used for accessing AFS private areas.
The steps should be the following:

8
docs/merlin6/how-to-use-merlin/nomachine.md
View File

@@ -45,7 +45,7 @@ the following fields:
* **Protocol**: specify the protocol that will be used for the connection. *Recommended* protocol: **`NX`**
* **Port**: Specify the listening port of the **front-end**. It must be **`4000`**.
![Create New NoMachine Connection](/images/nomachine/screen_nx_connect.png)
![Create New NoMachine Connection](../../images/nomachine/screen_nx_connect.png)
#### Configuring NoMachine Authentication Method
@@ -62,19 +62,19 @@ session if none exists.
If there are existing sessions, instead of opening a new desktop session, users can reconnect to an
existing one by clicking to the proper icon (see image below).
![Open an existing Session](/images/nomachine/screen_nx_existingsession.png)
![Open an existing Session](../../images/nomachine/screen_nx_existingsession.png)
Users can also create a second desktop session by selecting the **`New Desktop`** button (*red* rectangle in the
below image). This will create a second session on the second login node, as long as this node is up and running.
![Open a New Desktop](/images/nomachine/screen_nx_newsession.png)
![Open a New Desktop](../../images/nomachine/screen_nx_newsession.png)
### NoMachine LightDM Session Example
An example of the NoMachine session, which is based on [LightDM](https://github.com/canonical/lightdm)
X Windows:
![NoMachine Session: LightDM Desktop](/images/nomachine/screen_nx11.png)
![NoMachine Session: LightDM Desktop](../../images/nomachine/screen_nx11.png)
## Accessing Merlin6 NoMachine from outside PSI