transfer-data.md nomachine.md updates

pages/merlin6/02 accessing-merlin6/nomachine.md

@@ -19,14 +19,7 @@ NoMachine is available for PSI Windows computers in the Software Kiosk under the
 name **NX Client**. Please use the latest version (at least 6.0). For MacOS and
 Linux, the NoMachine client can be downloaded from https://www.nomachine.com/.
 
-## Access restrictions
+## Accessing Merlin6 NoMachine from PSI
-
-Currently, NoMachine access is only possible from the PSI Network. Users needing
-remote access from outside PSI must request VPN access. This has to be requested
-to the IT Department by opening a PSI Service Now ticket:
-[VPN Access (PSI employees)](https://psi.service-now.com/psisp?id=psi_new_sc_cat_item&sys_id=beccc01b6f44a200d02a82eeae3ee440)
-
-## Accessing Merlin6 NoMachine
 
 The Merlin6 NoMachine service is located **only** in the following login nodes:
 
@@ -106,3 +99,19 @@ An example of the NoMachine session, which is based on [LightDM](https://github.
 X Windows:
 
 ![NoMachine Session: LightDM Desktop]({{ "/images/NoMachine/screen_nx11.png" }})
+
+## Accessing Merlin6 NoMachine from outside PSI
+
+### No VPN access
+
+Access to the Merlin6 NoMachine service is possible without VPN through **'rem-acc.psi.ch'**.
+Please follow the steps described in [PSI Remote Interactive Access](https://www.psi.ch/en/photon-science-data-services/remote-interactive-access) for
+remote access to the Merlin6 NoMachine services. Once logged in **'rem-acc.psi.ch'**, you must then login to one of the available MErlin6 NoMachine
+services.
+
+### VPN access
+
+Remote access is also possible through VPN, however, you **must not use 'rem-acc.psi.ch'**, and you have to connect directly
+to the Merlin6 NoMachine services as if you were inside PSI. For VPN access, you should request it to the IT department by
+opening a PSI Service Now ticket: 
+[VPN Access (PSI employees)](https://psi.service-now.com/psisp?id=psi_new_sc_cat_item&sys_id=beccc01b6f44a200d02a82eeae3ee440).

pages/merlin6/02 accessing-merlin6/transfer-data.md

@@ -37,11 +37,49 @@ from the Software Kiosk on PSI machines. Add `merlin-l-01.psi.ch` as a host and
 connect with your PSI credentials. You can then drag-and-drop files between your
 local computer and merlin.
 
-
 ## Transferring Data to/from outside PSI
 
-Merlin6 is only accessible from within the PSI network. To connect from outside you can use
+Two servers are enabled for exporting data from Merlin to outside PSI. 
+These Remote Access Merlin servers are the following:
+* **'ra-merlin-01.psi.ch'**
+* **'ra-merlin-02.psi.ch'**
+
+Due to security reasons, currently only ``/data/user`` directories are exported in Read-Only mode.
+This policy will change in the future but in the meantime we allow users to export their files
+in an easy way.
+
+{{site.data.alerts.warning}}Please, <b>ensure proper secured permissions</b>. By default,
+when directory is created, the system applies the most restrictive permissions. However,
+this does not prevent users for changing permissions if they wish. At this point, users
+become responsible of those changes.
+{{site.data.alerts.end}}
+
+Transferring big amounts of data from outside PSI to Merlin is not possible yet, unless
+this is done from PSI (i.e. transferring files from CSCS to Merlin is possible by using
+`scp` / `rsync` commands from the Merlin6 login nodes).
+
+### Accepted protocols
+
+Accepted protocols for Remote Access Merlin servers are the following:
+* **sftp**: **``sftp``** command or similar X11/Windows/MacOS based programs.
+* **ssh**: **`scp`** command (as well as **WinSCP** and similar programs) or **`rsync`** command
+* **~~Globus Online~~**: ***not available yet.***
+
+### About Remote Access Servers
+
+SSH is one of the allowed protocols. 
+* Please, **absolutely never** use this servers as a login node.
+* Please avoid copying files to the *home* directories. 
+
+Only ``/data/user`` should be used on these nodes, and exclusively for transferring data to outside PSI.
+
+## Connecting to Merlin6 from outside PSI
+
+Merlin6 is fully accessible from within the PSI network. To connect from outside you can use:
 
 - [VPN](https://www.psi.ch/en/computing/vpn) ([alternate instructions](https://intranet.psi.ch/BIO/ComputingVPN))
 - [SSH hop](https://www.psi.ch/en/computing/ssh-hop)
+   * Please avoid transferring big amount data through **hop**
 - [No Machine](nomachine.md)
+   * Remote Interactive Access through [**'rem-acc.psi.ch'**](https://www.psi.ch/en/photon-science-data-services/remote-interactive-access)
+   * Please avoid transferring big amount of data through **NoMachine**