@@ -22,7 +22,8 @@
2222-- machine using the standard Cloud Haskell primitives. In an ideal world, we
2323-- could just start a Cloud Haskell node on the local machine, too.
2424-- Unfortunately, Cloud Haskell does not yet support using multiple network
25−-- transports (TCP/IP vs SSH). This is a temporary workaround.
25+-- transports within the same system (i.e. both TCP/IP and SSH). This is a
26+-- temporary workaround.
2627--
2728-- [Azure Setup]
2829--
@@ -45,11 +46,11 @@
4546-- /as well as on your local machine/. We use Ubuntu Server 12.04 LTS for our
4647-- tests (running on VirtualBox on our local machine).
4748--
48−-- When you set up your virtual machine, you can pick an arbitrary name; these
49−-- names are for your own use only and do not need to be globally unique. Set a
50−-- username and password; you should use the same username on all virtual
51−-- machines. You should also upload
52−-- an SSH key for authentication (see
49+-- When you set up your virtual machine, you can pick an arbitrary virtual
50+-- machine name; these names are for your own use only and do not need to be
51+-- globally unique. Set a username and password; you should use the same
52+-- username on all virtual machines. You should also upload an SSH key for
53+-- authentication (see
5354-- /Converting OpenSSH keys for use on Windows Azure Linux VM's/,
5455-- <http://utlemming.azurewebsites.net/?p=91>, for
5556-- information on how to convert a standard Linux @id_rsa.pub@ public key to
@@ -63,8 +64,8 @@
6364-- Once your virtual machines have been set up, you have to make sure that the
6465-- user you created when you created the VM can ssh from any virtual machine to
6566-- any other using public key authentication. Moreover, you have to make sure
66−-- that @libssh2@ is installed; if you are using the Ubuntu image we recommend
67−-- you can install @libssh2@ using
67+-- that @libssh2@ is installed; if you are using the Ubuntu image you can
68+-- install @libssh2@ using
6869--
6970-- > sudo apt-get install libssh2-1
7071--
@@ -72,7 +73,7 @@
7273-- message.)
7374--
7475-- In these notes, we assume three virtual machines called @CHDemo1@,
75−-- @CHDemo2@, and @CHDemo3@, all part of the @CloudHaskellDemo@ cloud service.
76+-- @CHDemo2@, and @CHDemo3@, all part of a @CloudHaskellDemo@ cloud service.
7677--
7778-- [Obtaining a Management Certificate]
7879--
@@ -161,8 +162,9 @@
161162-- > type RemoteProcess a = Closure (Backend -> Process a)
162163--
163164-- (If you don't know what a 'Closure' is you should read
164−-- "Control.Distributed.Process.Closure".) 'spawnOnVM' terminates once the
165−-- Cloud Haskell node has been set up.
165+-- "Control.Distributed.Process.Closure".); the remote process will be supplied
166+-- with an Azure backend initialized with the same parameters. 'spawnOnVM'
167+-- returns once the Cloud Haskell node has been set up.
166168--
167169-- 'callOnVM' is similar to 'spawnOnVM', but it takes a /pair/ of processes:
168170-- one to run on the remote host (on a newly created Cloud Haskell node), and
@@ -183,7 +185,7 @@
183185-- Before you can try it you will first need to copy the executable to the remote server:
184186--
185187-- > cloud-haskell-azure-echo install \
186−-- > --subscription-id <<your subscription ID> \
188+-- > --subscription-id <<your subscription ID>> \
187189-- > --certificate /path/to/credentials.x509 \
188190-- > --private /path/to/credentials.private \
189191-- > --user <<remote username>> \
@@ -195,7 +197,7 @@
195197-- you can run it as follows:
196198--
197199-- > cloud-haskell-azure-echo run \
198−-- > --subscription-id <<your subscription ID> \
200+-- > --subscription-id <<your subscription ID>> \
199201-- > --certificate /path/to/credentials.x509 \
200202-- > --private /path/to/credentials.private \
201203-- > --user <<remote username>> \
@@ -210,7 +212,7 @@
210212-- > #
211213--
212214-- "Control.Distributed.Process.Backend.Azure.GenericMain" provides a generic
213−-- main function that you can to structure your code. It provides command line
215+-- main function that you can use to structure your code. It provides command line
214216-- arguments such as the ones we saw in section /Testing the Setup/, it
215217-- initializes the Azure backend, and it takes care of running your code on the
216218-- remote machines. You don't have to use 'genericMain' if you prefer not to,
@@ -286,7 +288,7 @@
286288-- executable:
287289--
288290-- > cloud-haskell-azure-ping install \
289−-- > --subscription-id <<your subscription ID> \
291+-- > --subscription-id <<your subscription ID>> \
290292-- > --certificate /path/to/credentials.x509 \
291293-- > --private /path/to/credentials.private \
292294-- > --user <<remote username>> \
@@ -300,7 +302,7 @@
300302-- @--virtual-machine@ argument):
301303--
302304-- > cloud-haskell-azure-ping run \
303−-- > --subscription-id <<your subscription ID> \
305+-- > --subscription-id <<your subscription ID>> \
304306-- > --certificate /path/to/credentials.x509 \
305307-- > --private /path/to/credentials.private \
306308-- > --user <<remote username>> \
@@ -315,7 +317,7 @@
315317-- Finally, we can run the ping client:
316318--
317319-- > cloud-haskell-azure-ping run
318−-- > --subscription-id <<your subscription ID> \
320+-- > --subscription-id <<your subscription ID>> \
319321-- > --certificate /path/to/credentials.x509 \
320322-- > --private /path/to/credentials.private \
321323-- > --user <<remote username>> \
@@ -329,7 +331,7 @@
329331-- Note that we must pass a different port number, because the client will run
330332-- within its own Cloud Haskell instance.
331333--
332−-- The code for the ping server is similar to the echo server, but demonstrates
334+-- The code for the ping demo is similar to the echo demo, but demonstrates
333335-- both 'callable' and 'spawnable' and shows one way to discover nodes.
334336--
335337-- > {-# LANGUAGE TemplateHaskell #-}