Skip to content

Commit f28054b

Browse files
author
Marius van Witzenburg
committedApr 14, 2020
Cleanup whitespace
1 parent 0ed07b4 commit f28054b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+245
-251
lines changed
 

‎CODE-OF-CONDUCT.md

-1
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,3 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage], versi
7171
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
7272

7373
[homepage]: https://www.contributor-covenant.org
74-

‎README.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Usage:
4343

4444
Available Commands:
4545
bootstrap Bootstrap a FreeBSD release for container base.
46-
clone Clone an existing container.
46+
clone Clone an existing container.
4747
cmd Execute arbitrary command on targeted container(s).
4848
clone Clone an existing container.
4949
console Console into a running container.
@@ -163,9 +163,9 @@ container at `10.17.89.45`.
163163

164164
Finally, enable and (re)start the firewall:
165165

166-
## dynamic rdr
166+
## dynamic rdr
167167

168-
The `rdr-anchor "rdr/*"` enables dynamic rdr rules to be setup using the
168+
The `rdr-anchor "rdr/*"` enables dynamic rdr rules to be setup using the
169169
`bastille rdr` command at runtime - eg.
170170

171171
```
@@ -176,7 +176,7 @@ The `rdr-anchor "rdr/*"` enables dynamic rdr rules to be setup using the
176176
```
177177

178178
Note that if you are rediirecting ports where the host is also listening
179-
(eg. ssh) you should make sure that the host service is not listening on
179+
(eg. ssh) you should make sure that the host service is not listening on
180180
the cloned interface - eg. for ssh set sshd_flags in rc.conf
181181

182182
## Enable pf rules
@@ -268,7 +268,7 @@ default this value is set to "base". Additional components are added, space
268268
separated, without file extension.
269269

270270
Bastille will attempt to fetch the required archives if they are not found in
271-
the `cache/$RELEASE` directory.
271+
the `cache/$RELEASE` directory.
272272

273273
Downloaded artifacts are stored in the `cache/RELEASE` directory. "bootstrapped"
274274
releases are stored in `releases/RELEASE`.
@@ -782,7 +782,7 @@ root@folsom:~ #
782782
783783
At this point you are logged in to the container and have full shell access.
784784
The system is yours to use and/or abuse as you like. Any changes made inside
785-
the container are limited to the container.
785+
the container are limited to the container.
786786
787787
788788
bastille cp
@@ -808,8 +808,8 @@ bastille rdr
808808
------------
809809
810810
`bastille rdr` allows you to configure dynamic rdr rules for your containers
811-
without modifying pf.conf (assuming you are using the `bastille0` interface
812-
for a private network and have enabled `rdr-anchor 'rdr/*'` in /etc/pf.conf
811+
without modifying pf.conf (assuming you are using the `bastille0` interface
812+
for a private network and have enabled `rdr-anchor 'rdr/*'` in /etc/pf.conf
813813
as described in the Networking section).
814814
815815
```shell
@@ -907,7 +907,7 @@ Note: On UFS systems containers must be stopped before export.
907907
ishmael ~ # bastille export folsom
908908
Exporting 'folsom' to a compressed .xz archive.
909909
Sending zfs data stream...
910-
100 % 1057.2 KiB / 9231.5 KiB = 0.115 0:01
910+
100 % 1057.2 KiB / 9231.5 KiB = 0.115 0:01
911911
Exported '/usr/local/bastille/jails/backups/folsom_2020-01-26-19:23:04.xz' successfully.
912912
913913
```
@@ -923,7 +923,7 @@ File validation successful!
923923
Importing 'folsom' from compressed .xz archive.
924924
Receiving zfs data stream...
925925
/usr/local/bastille/jails/backups/folsom_2020-01-26-19:22:23.xz (1/1)
926-
100 % 626.4 KiB / 9231.5 KiB = 0.068 0:02
926+
100 % 626.4 KiB / 9231.5 KiB = 0.068 0:02
927927
Container 'folsom' imported successfully.
928928
```
929929
@@ -1020,7 +1020,7 @@ limit the target areas available to anyone that has (or has gained) access.
10201020
Networking Tips
10211021
===============
10221022
1023-
Tip #1:
1023+
Tip #1:
10241024
-------
10251025
Ports and destinations can be defined as lists. eg;
10261026
```
@@ -1032,7 +1032,7 @@ round-robin between containers with ips 45, 46, 47, and 48 (on ports 80 or
10321032
443).
10331033
10341034
1035-
Tip #2:
1035+
Tip #2:
10361036
-------
10371037
Ports can redirect to other ports. eg;
10381038
```

0 commit comments

Comments
 (0)
Please sign in to comment.