Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos #1050

Merged
merged 1 commit into from
Nov 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions doc/tutorials/ensemble.md
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ Arguments:
server-id the server id
```

The repl suppors a few control commands:
The repl supports a few control commands:
```
Control commands:
,(import module-id) -- import a module locally for expansion
Expand Down Expand Up @@ -343,7 +343,7 @@ $ gerbil build
...
```

Firt let's look at the server implementation in [src/tutorial/ensemble/server.ss](https://github.com/mighty-gerbils/gerbil/tree/master/src/tutorial/ensemble/server.ss):
First let's look at the server implementation in [src/tutorial/ensemble/server.ss](https://github.com/mighty-gerbils/gerbil/tree/master/src/tutorial/ensemble/server.ss):
```scheme
(import :gerbil/gambit/threads
:std/net/httpd
Expand Down Expand Up @@ -452,7 +452,7 @@ the code with the handlers lives in [src/tutorial/ensemble/handler.ss](https://g
```

This code registers a root handler, and provides two more handlers
that are not initially registerd anywhere.
that are not initially registered anywhere.

Here is how we can load the code:
```
Expand Down Expand Up @@ -632,7 +632,7 @@ even these networks can be breached as we know.
So what do you need to do in order to enable TLS? Well, not all that
much, as TLS is deeply integrated in the actors package:
- You need to generate an actor ensemble CA; the is handled by the
`gerbil ensembe ca` tool, as we will see shortly.
`gerbil ensemble ca` tool, as we will see shortly.
- You need to generate certificates for your servers; this again is
handled by the `gerbil ensemble ca` tool.
- You need to bundle and ship your servers' ensemble environment
Expand Down Expand Up @@ -661,7 +661,7 @@ Usage: gxensemble ca setup [command-option ...]

Command Options:
--view inspect existing, don't generate
--domain <domain> ensembe TLS domain [default: ensemble.local]
--domain <domain> ensemble TLS domain [default: ensemble.local]
--subject/C <subject/C> ensemble TLS CA Country [default: UN]
--subject/O <subject/O> ensemble TLS CA Organization [default: Mighty Gerbils]
--subject/L <subject/L> ensemble TLS certificate location [default: Internet]
Expand All @@ -670,9 +670,9 @@ Command Options:
So let's set up a new CA for our tutorial project:
```
$ gerbil ensemble ca setup
Enter root CA passphprase: ...
Enter root CA passphrase: ...
....
Enter subordinate CA passphprase: ...
Enter subordinate CA passphrase: ...
...
```

Expand Down Expand Up @@ -804,7 +804,7 @@ Next we are going to generate two server certificates: one for the
registry and one for the httpd we are going to run; we will not grant
any capabilities to the servers.

Here is the usage of the `gerbil ensmeble ca cert` tool:
Here is the usage of the `gerbil ensemble ca cert` tool:
```
$ gerbil ensemble ca help cert
Usage: gxensemble ca cert [command-option ...] <server-id> [<capabilities>]
Expand All @@ -825,10 +825,10 @@ Arguments:
And here is how we generate the certificates:
```
$ gerbil ensemble ca cert registry
Enter subordinate CA passphprase: ...
Enter subordinate CA passphrase: ...
...
$ gerbil ensemble ca cert httpd
Enter subordinate CA passphprase: ...
Enter subordinate CA passphrase: ...
...
```

Expand Down
14 changes: 7 additions & 7 deletions src/tools/gxensemble.ss
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@
(def ca-domain-option
(option 'domain "--domain"
default: "ensemble.local"
help: "ensembe TLS domain"))
help: "ensemble TLS domain"))

(def ca-subject/C-option
(option 'subject/C "--subject/C"
Expand Down Expand Up @@ -433,8 +433,8 @@
(let* ((pubk-path (default-admin-pubkey-path))
(pubk-raw (read-file-u8vector pubk-path)))
(displayln (hex-encode pubk-raw)))
(let* ((passphrase (read-password prompt: "Enter passphprase: "))
(again (read-password prompt: "Re-enter passphprase: ")))
(let* ((passphrase (read-password prompt: "Enter passphrase: "))
(again (read-password prompt: "Re-enter passphrase: ")))
(unless (equal? passphrase again)
(error "administrative passphrases don't match"))
(generate-admin-keypair! passphrase force: (hash-get opt 'force)))))
Expand Down Expand Up @@ -501,16 +501,16 @@
((file-exists? (path-expand "caroot.pem" (ensemble-tls-base-path)))
(displayln "caroot.pem already exists"))
(else
(let* ((root-passphrase (read-password prompt: "Enter root CA passphprase: "))
(again (read-password prompt: "Re-enter passphprase: ")))
(let* ((root-passphrase (read-password prompt: "Enter root CA passphrase: "))
(again (read-password prompt: "Re-enter passphrase: ")))
(unless (equal? root-passphrase again)
(error "root CA passphrases don't match"))
(generate-actor-tls-root-ca! root-passphrase
domain: (hash-ref opt 'domain)
country-name: (hash-ref opt 'subject/C)
organization-name: (hash-ref opt 'subject/O))
(let* ((sub-passphrase (read-password prompt: "Enter subordinate CA passphprase: "))
(again (read-password prompt: "Re-enter passphprase: ")))
(let* ((sub-passphrase (read-password prompt: "Enter subordinate CA passphrase: "))
(again (read-password prompt: "Re-enter passphrase: ")))
(unless (equal? sub-passphrase again)
(error "subordinate CA passphrases don't match"))
(generate-actor-tls-sub-ca! root-passphrase sub-passphrase
Expand Down