Merge branch '76-napsat-navod-na-novou-vpn' into 'master'

Resolve "Návod na FortiClient VPN"

Closes #76

See merge request !289

docs.it4i/general/accessing-the-clusters/vpn-access.md

@@ -2,71 +2,61 @@
 
 ## Accessing IT4Innovations Internal Resources via VPN
 
-For using resources and licenses which are located at IT4Innovations local network, it is necessary to VPN connect to this network. We use Cisco AnyConnect Secure Mobility Client. See the list of supported operating systems [here][a].
+To access IT4Innovations' resources and licenses, it is necessary to connect to its local network via VPN. IT4Innovations uses the FortiClient VPN software. For the list of supported operating systems, see the [FortiClient Administration Guide][a].
 
-It is impossible to connect to VPN from other operating systems.
+## Windows/Mac VPN Client Installation
 
-## VPN Client Installation
+To install the VPN client from the web interface, log in to [reconnect.it4i.cz][b] with your [IT4I credentials][1].
 
-You can install a VPN client from the web interface after successful login with [IT4I credentials][1] [here][b].
+![](../../img/fc_vpn_web_login.png)
 
-![](../../img/vpn_web_login.png)
+Click the Download FortiClient button and select your OS.
 
-According to the Java settings after login, the client either automatically installs or downloads the installation file for your operating system. It is necessary to allow start of the installation tool for automatic installation. If auto install does not start, then proceed with a manual installation described in next steps.
+!!! note
+    Download just the FortiClient VPN, not the full FortiClient.
 
-![](../../img/vpn_web_login_2.png)
-![](../../img/vpn_web_install_2.png)
-![](../../img/copy_of_vpn_web_install_3.png)
+After successful installation, run FortiClient either directly, or by returning to the SSL-VPN Portal
+and clicking the Launch FortiClient button.
 
-After the successful installation, a VPN connection will be established and you can use available resources from the IT4I network.
+## Working With Windows/Mac VPN Client
 
-![](../../img/vpn_web_install_4.png)
+Before the first login, you must configure the VPN. In the New VPN Connection section, provide the name of your VPN connection and the following settings:
 
-If your Java setting does not allow automatic installation, you can download the installation file and install the VPN client manually.
+Name                | Value
+:-------------------|:------------------
+VPN                 | SSL-VPN
+Remote Gateway      | reconnect.it4i.cz
+Port                | 443
+Client Certificate  | None
 
-![](../../img/vpn_web_download.png)
+Optionally, you can describe the VPN connection and select Save Login under Authentication.
 
-After you click on the link, download of installation file will start.
+![](../../img/fc_vpn_web_login_2_1.png)
 
-![](../../img/vpn_web_download_2.png)
+Save the settings, enter your login credentials and click Connect.
 
-After a successful download of the installation file, you have to execute this executable with administrator or root rights and install the VPN client manually.
+!!! note
+    Make sure your username and password are correct. If you enter invalid credentials, FortiClient returns a general warning (-14).
 
-## Working With VPN Client
+![](../../img/fc_vpn_web_login_3_1.png)
 
-You can use the GUI or the command line interface to run the VPN client on all supported operating systems. We suggest using the GUI.
+You can disconnect by clicking the button or right clicking on the system tray icon.
 
-Before the first login to VPN, you have to fill the URL `https://vpn.it4i.cz/user` into the text field.
+## Linux Client
 
-![](../../img/vpn_contacting_https_cluster.png)
+You may use any open version of FortiClient, although OpenFortiGUI seems to work the best. Connection will work with following settings:
 
-After you click on the Connect button, you must fill your login credentials.
+Name         | Value
+:------------|:----------------------
+VPN-Server   | reconnect.it4i.cz
+VPN-Port     | 443
+Set-Routes   | Enabled
+Set-DNS      | Enabled
+DNS Servers  | 10.5.16.11, 10.5.16.22
 
-![](../../img/vpn_contacting_https.png)
-
-After a successful login, the client will minimize to the system tray. If everything works, you can see a lock in the Cisco tray icon.
-
-![](../../img/anyconnecticon.jpg)
-
-If you right-click on this icon, you will see a context menu in which you can control the VPN connection.
-
-![](../../img/anyconnectcontextmenu.jpg)
-
-When you connect to the VPN for the first time, the client downloads the profile and creates a new item "IT4I cluster" in the connection list. For subsequent connections, it is not necessary to re-enter the URL address, but just select the corresponding item.
-
-![](../../img/vpn_contacting.png)
-
-After that, AnyConnect automatically proceeds like in the case of first logon.
-
-![](../../img/vpn_login.png)
-
-After a successful logon, you can see a green circle with a tick mark on the lock icon.
-
-![](../../img/vpn_successfull_connection.png)
-
-For disconnecting, right-click on the AnyConnect client icon in the system tray and select **VPN Disconnect**.
+Linux VPN clients need to run under root. OpenFortiGUI uses sudo by default, be sure, that your user is allowed to use sudo.
 
 [1]: ../../general/obtaining-login-credentials/obtaining-login-credentials.md#login-credentials
 
-[a]: https://www.cisco.com/c/en/us/support/docs/smb/routers/cisco-rv-series-small-business-routers/smb5457-cisco-anyconnect-secure-mobility-client-supported-operating.html
-[b]: https://vpn.it4i.cz/+CSCOE+/logon.html?tgroup=USER
+[a]: http://docs.fortinet.com/document/forticlient/6.4.0/administration-guide/646779/installation-requirements
+[b]: https://reconnect.it4i.cz

docs.it4i/index.md

@@ -31,7 +31,7 @@ In many cases, you will run your own code on the cluster. In order to fully expl
 
 * **node:** a computer, interconnected via a network to other computers - Computational nodes are powerful computers, designed for, and dedicated to executing demanding scientific computations.
 * **core:** a processor core, a unit of processor, executing computations
-* **core-hour:** also normalized core-hour, NCH. A metric of computer utilization, [see definition][5].
+* **core-hour:** also normalized core-hour (NCH). A metric of computer utilization, [see definition][5].
 * **job:** a calculation running on the supercomputer - the job allocates and utilizes the resources of the supercomputer for certain time.
 * **HPC:** High Performance Computing
 * **HPC (computational) resources:** corehours, storage capacity, software licenses