Skip to content

Commit 107b10a

Browse files
committed
Address @bkmgit's review comments
1 parent 04a4f6c commit 107b10a

File tree

4 files changed

+43
-16
lines changed

4 files changed

+43
-16
lines changed

_episodes/11-connecting.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ is tedious and gets old very fast. This is where the [SSH Agent][ssh-agent]
212212
comes in.
213213

214214
Using an SSH Agent, you can type your password for the private key once, then
215-
have the Agent remember for some number of hours or until you log off. Unless
216-
some nefarious actor has physical access to your machine, this keeps the
215+
have the Agent remember it for some number of hours or until you log off.
216+
Unless some nefarious actor has physical access to your machine, this keeps the
217217
password safe, and removes the tedium of entering the password multiple times.
218218

219219
Just remember your password, because once it expires in the Agent, you have to

_episodes/14-modules.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ objectives:
99
- "Understand how the module mechanism interacts with the shell."
1010
keypoints:
1111
- "Load software with `module load softwareName`."
12-
- "Unload software with `module purge`"
12+
- "Unload software with `module unload`"
1313
- "The module system handles software versioning and package conflicts for you
1414
automatically."
1515
---
@@ -153,7 +153,7 @@ the manipulation of environment variables like `$PATH`. There
153153
is usually little or no data transfer involved.
154154

155155
The module loading process manipulates other special environment
156-
variables as well, including variables that influence where the
156+
variables as well, including variables that influence where the
157157
system looks for software libraries, and sometimes variables which
158158
tell commercial software packages where to find license servers.
159159

_episodes/15-transferring-files.md

+37-10
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,23 @@ objectives:
88
- "Be able to transfer files to and from a computing cluster."
99
keypoints:
1010
- "`wget` and `curl -O` download a file from the internet."
11-
- "`scp` transfer files to and from your computer."
11+
- "`scp` and `rsync` transfer files to and from your computer."
1212
- "You can use an SFTP client like FileZilla to transfer files through a GUI."
1313
---
1414

15-
Computing with a remote computer offers very limited utility if we cannot
16-
get files to or from the cluster. There are several options for
17-
transferring data between computing resources, from command line
18-
options to GUI programs, which we will cover here.
15+
Performing work on a remote computer is not very useful if we cannot get files
16+
to or from the cluster. There are several options for transferring data between
17+
computing resources using CLI and GUI utilities, a few of which we will cover.
1918

2019
## Download Files From the Internet
2120

2221
One of the most straightforward ways to download files is to use either `curl`
2322
or `wget`. One of these is usually installed in most Linux shells, on Mac OS
24-
terminal and in GitBash. Any file that can be downloaded in your web browser
25-
through a direct link can be downloaded using `curl -O` or `wget`. This is a
26-
quick way to download datasets or source code.
23+
terminal and in GitBash. Any file that can be downloaded in your web browser
24+
through a direct link can be downloaded using `curl -O` or `wget`. This is a
25+
quick way to download datasets or source code.
2726

28-
The syntax for these commands is: `curl -O https://some/link/to/a/file`
27+
The syntax for these commands is: `curl -O https://some/link/to/a/file`
2928
and `wget https://some/link/to/a/file`. Try it out by downloading
3029
some material we'll use later on, from a terminal on your local machine.
3130

@@ -53,7 +52,7 @@ or
5352

5453
To copy a single file to or from the cluster, we can use `scp` ("secure copy").
5554
The syntax can be a little complex for new users, but we'll break it down.
56-
The `scp` command is a relative of the `ssh` command we used to
55+
The `scp` command is a relative of the `ssh` command we used to
5756
access the system, and can use the same public-key authentication
5857
mechanism.
5958

@@ -203,6 +202,34 @@ A trailing slash on the target directory is optional, and has no effect for
203202
> {: .language-bash}
204203
{: .callout}
205204
205+
All file transfers using the above methods use SSH to encrypt data sent through
206+
the network. So, if you can connect via SSH, you will be able to transfer
207+
files. By default, SSH uses network port 22. If a custom SSH port is in use,
208+
you will have to specify it using the appropriate flag, often `-p`, `-P`, or
209+
`--port`. Check `--help` or the `man` page if you're unsure.
210+
211+
> ## Change the Rsync Port
212+
>
213+
> Say we have to connect `rsync` through port 768 instead of 22. How would we
214+
> modify this command?
215+
>
216+
> ```
217+
> {{ site.local.prompt }} rsync test.txt {{ site.remote.user }}@{{ site.remote.login }}:
218+
> ```
219+
> {: .language-bash}
220+
>
221+
> > ## Solution
222+
> >
223+
> > ```
224+
> > {{ site.local.prompt }} rsync --help | grep port
225+
> > --port=PORT specify double-colon alternate port number
226+
> > See http://rsync.samba.org/ for updates, bug reports, and answers
227+
> > {{ site.local.prompt }} rsync --port=768 test.txt {{ site.remote.user }}@{{ site.remote.login }}:
228+
> > ```
229+
> > {: .language-bash}
230+
> {: .solution}
231+
> {: .challenge}
232+
206233
## Transferring Files Interactively with FileZilla
207234
208235
FileZilla is a cross-platform client for downloading and uploading files to and

index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ By the end of this workshop, students will know how to:
2323

2424
* Identify problems a cluster can help solve
2525
* Use the UNIX shell (also known as terminal or command line) to
26-
connect to a cluster.
27-
* Download files from the internet directly on a cluster.
26+
connect to a cluster.
27+
* Transfer files onto a cluster.
2828
* Submit and manage jobs on a cluster using a scheduler.
2929
* Observe the benefits and limitations of parallel execution.
3030

0 commit comments

Comments
 (0)