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

Update to service03.merlin7.psi.ch
All checks were successful
Build and Deploy Documentation / build-and-deploy (push) Successful in 9s
Details

Browse Source
This commit is contained in:
caubet_m
2025-08-25 14:52:24 +02:00
parent e4a425e095
commit 40f48e5eaf
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pages/merlin7/02-How-To-Use-Merlin/transfer-data.md
View File

@@ -28,8 +28,8 @@ Most data transfer methods support both sending and receiving, so you may initia
| ------------------------------------------------- | --------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------- | | ------------------------------------------------- | --------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------- |
| Small dataset, Linux/macOS | `rsync` | Resume support, skips existing files, works over SSH | | Small dataset, Linux/macOS | `rsync` | Resume support, skips existing files, works over SSH |
| Quick one-time small transfer | `scp` | Simple syntax, no need to install extra tools | | Quick one-time small transfer | `scp` | Simple syntax, no need to install extra tools |
| Large dataset, high speed needed (not sensitive) | FTP via `ftp-unencrypted03.merlin7.psi.ch` | Fastest transfer speed (unencrypted data channel) | | Large dataset, high speed needed (not sensitive) | FTP via service03.merlin7.psi.ch` | Fastest transfer speed (unencrypted data channel) |
| Large dataset, high speed needed (sensitive data) | FTP via `ftp-encrypted.merlin7.psi.ch` | Encrypted control & data channels for security, but slower than `ftp-unencrypted03` | | Large dataset, high speed needed (sensitive data) | FTP via `ftp-encrypted.merlin7.psi.ch` | Encrypted control & data channels for security, but slower than service03` |
| Windows interactive GUI transfer | WinSCP | User-friendly interface, PSI Software Kiosk, supports drag-and-drop | | Windows interactive GUI transfer | WinSCP | User-friendly interface, PSI Software Kiosk, supports drag-and-drop |
| Cross-platform interactive GUI transfer | FileZilla | User-friendly interface, works on Linux/macOS/Windows, supports drag-and-drop | | Cross-platform interactive GUI transfer | FileZilla | User-friendly interface, works on Linux/macOS/Windows, supports drag-and-drop |
| From the internet to PSI | [PSI Data Transfer Service](https://www.psi.ch/en/photon-science-data-services/data-transfer) | Supports SSH-based protocols and Globus | | From the internet to PSI | [PSI Data Transfer Service](https://www.psi.ch/en/photon-science-data-services/data-transfer) | Supports SSH-based protocols and Globus |
@@ -73,7 +73,7 @@ scp ~/localfile.txt $USER@login001.merlin7.psi.ch:/data/project/general/myprojec
A `vsftpd` service is available on the login nodes, providing high-speed transfers. Choose the server based on your **speed vs. encryption** needs: A `vsftpd` service is available on the login nodes, providing high-speed transfers. Choose the server based on your **speed vs. encryption** needs:
* **`login001.merlin7.psi.ch`:** Encrypted control & data channels. * **`login001.merlin7.psi.ch`:** Encrypted control & data channels.
**Use if your data is sensitive**. **Slower**, but secure. **Use if your data is sensitive**. **Slower**, but secure.
* **`ftp-unencrypted03.merlin7.psi.ch`: Encrypted control channel only. * **service03.merlin7.psi.ch`: Encrypted control channel only.
Use if your data can be transferred unencrypted. **Fastest** method. Use if your data can be transferred unencrypted. **Fastest** method.
{{site.data.alerts.tip}} {{site.data.alerts.tip}}
@@ -88,7 +88,7 @@ Available in the **Software Kiosk** on PSI Windows machines.
* when using port 22, connect to `login001.merlin7.psi.ch` or `login002.merlin7.psi.ch`. * when using port 22, connect to `login001.merlin7.psi.ch` or `login002.merlin7.psi.ch`.
* when using port 21, connect to: * when using port 21, connect to:
* `ftp-encrypted.merlin7.psi.ch`: **Fast** transfer rates. **Both** control and data **channels encrypted**. * `ftp-encrypted.merlin7.psi.ch`: **Fast** transfer rates. **Both** control and data **channels encrypted**.
* `ftp-unencrypted03.merlin7.psi.ch`: **Fastest** transfer rates, but **data channel not encrypted**. * service03.merlin7.psi.ch`: **Fastest** transfer rates, but **data channel not encrypted**.
* Drag and drop files between your PC and Merlin. * Drag and drop files between your PC and Merlin.
* FTP (port 21) * FTP (port 21)
@@ -100,7 +100,7 @@ Download from [FileZilla Project](https://filezilla-project.org/), or install fr
* when using port 22, connect to `login001.merlin7.psi.ch` or `login002.merlin7.psi.ch`. * when using port 22, connect to `login001.merlin7.psi.ch` or `login002.merlin7.psi.ch`.
* when using port 21, connect to: * when using port 21, connect to:
* `ftp-encrypted.merlin7.psi.ch`: **Fast** transfer rates. **Both** control and data **channels encrypted**. * `ftp-encrypted.merlin7.psi.ch`: **Fast** transfer rates. **Both** control and data **channels encrypted**.
* `ftp-unencrypted03.merlin7.psi.ch`: **Fastest** transfer rates, but **data channel not encrypted**. * service03.merlin7.psi.ch`: **Fastest** transfer rates, but **data channel not encrypted**.
* Supports drag-and-drop file transfers. * Supports drag-and-drop file transfers.
## Sharing Files with SWITCHfilesender ## Sharing Files with SWITCHfilesender