Update docs
All checks were successful
Build and Deploy Documentation / build-and-deploy (push) Successful in 6s
All checks were successful
Build and Deploy Documentation / build-and-deploy (push) Successful in 6s
This commit is contained in:
@@ -24,18 +24,18 @@ Most data transfer methods support both sending and receiving, so you may initia
|
||||
|
||||
### Choosing the best transfer method
|
||||
|
||||
| **Scenario** | **Recommended Method** | **Reason** |
|
||||
| ------------------------------------------------- | --------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------- |
|
||||
| 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 |
|
||||
| Large dataset, high speed needed (not sensitive) | FTP via `login002` | Fastest transfer speed (unencrypted data channel) |
|
||||
| Large dataset, high speed needed (sensitive data) | FTP via `login001` | Encrypted control & data channels for security, but slower than `login002` |
|
||||
| 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 |
|
||||
| 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 |
|
||||
| Need for sharing large files | [SWITCHfilesender](https://filesender.switch.ch/filesender2/?s=upload) | Supports sharing large file and expiration date |
|
||||
| PSI -> Merlin7 over FTP | Any FTP-based client | Port 21 allowed from PSI to Merlin7 |
|
||||
| PSI -> Merlin7 over SSH | Any SSH-based method | Port 22 allowed from PSI to Merlin7 |
|
||||
| **Scenario** | **Recommended Method** | **Reason** |
|
||||
| ------------------------------------------------- | --------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------- |
|
||||
| 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 |
|
||||
| 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 (sensitive data) | FTP via `ftp-encrypted.merlin7.psi.ch` | Encrypted control & data channels for security, but slower than `ftp-unencrypted03` |
|
||||
| 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 |
|
||||
| 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 |
|
||||
| Need for sharing large files | [SWITCHfilesender](https://filesender.switch.ch/filesender2/?s=upload) | Supports sharing large file and expiration date |
|
||||
| PSI -> Merlin7 over FTP | Any FTP-based client | Port 21 allowed from PSI to Merlin7 |
|
||||
| PSI -> Merlin7 over SSH | Any SSH-based method | Port 22 allowed from PSI to Merlin7 |
|
||||
|
||||
The next chapters contain detailed information about the different transfer methods available on Merlin7.
|
||||
|
||||
@@ -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:
|
||||
* **`login001.merlin7.psi.ch`:** Encrypted control & data channels.
|
||||
**Use if your data is sensitive**. **Slower**, but secure.
|
||||
* **`login002.merlin7.psi.ch`:** Encrypted control channel only.
|
||||
* **`ftp-unencrypted03.merlin7.psi.ch`: Encrypted control channel only.
|
||||
Use if your data can be transferred unencrypted. **Fastest** method.
|
||||
|
||||
{{site.data.alerts.tip}}
|
||||
@@ -84,19 +84,25 @@ The <b>control channel</b> is always <b>encrypted</b>, therefore, authentication
|
||||
### WinSCP (Windows)
|
||||
|
||||
Available in the **Software Kiosk** on PSI Windows machines.
|
||||
* Connect to `login001.merlin7.psi.ch` or `login002.merlin7.psi.ch` using your PSI credentials.
|
||||
* Using your PSI credentials, connect to
|
||||
* when using port 22, connect to `login001.merlin7.psi.ch` or `login002.merlin7.psi.ch`.
|
||||
* when using port 21, connect to:
|
||||
* `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**.
|
||||
* Drag and drop files between your PC and Merlin.
|
||||
|
||||
**Supported protocols:** SSH (port 22), FTP (port 21)
|
||||
* FTP (port 21)
|
||||
|
||||
### FileZilla (Linux/MacOS/Windows)
|
||||
|
||||
Download from [FileZilla Project](https://filezilla-project.org/), or install from your Linux software repositories if available.
|
||||
* Connect to `login001.merlin7.psi.ch` or `login002.merlin7.psi.ch` using your PSI credentials.
|
||||
* Using your PSI credentials, connect to
|
||||
* when using port 22, connect to `login001.merlin7.psi.ch` or `login002.merlin7.psi.ch`.
|
||||
* when using port 21, connect to:
|
||||
* `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**.
|
||||
* Supports drag-and-drop file transfers.
|
||||
|
||||
**Supported protocols:** SSH (port 22), FTP (port 21)
|
||||
|
||||
## Sharing Files with SWITCHfilesender
|
||||
|
||||
**[SWITCHfilesender](https://filesender.switch.ch/filesender2/?s=upload)** is a Swiss-hosted installation of the [FileSender](https://filesender.org/) project — a web-based application that allows authenticated users to securely and easily send **arbitrarily large files** to other users. Features:
|
||||
|
||||
Reference in New Issue
Block a user