Skip to content

Commit 5168948

Browse files
authored
Merge pull request #1149 from BastilleBSD/1.0.20250714
1.0.20250714
2 parents 2070e84 + 97dc6ca commit 5168948

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

docs/chapters/centralized-assets.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ to create a custom release based on your jail.
6969
ishmael ~ # bastille convert myjail myrelease
7070
7171
Once this process completes, you will be able to run the following command to create a jail
72-
bases off of your newly created release.
72+
based off your newly created release.
7373

7474
Please note that using this approach is experimental. It will be up to the end user to keep
7575
track of which official FreeBSD release their custom release is based on. The ``osrelease``

docs/chapters/networking.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ Note that jails support specifying an IP without the subnet (/24 or whatever
8181
yours is) but we highly recommend setting it, especially on VNET jails. Not
8282
doing so can cause issues in some rare cases.
8383

84-
Bastille also supports IPv6. Instead of an IPv4 address, you can specify and
84+
Bastille also supports IPv6. Instead of an IPv4 address, you can specify an
8585
IPv6 address when creating a jail to use IPv6. It is also possible to use both
86-
by quoting and IPv4 and IPv6 address together as seen in the following example.
86+
by quoting an IPv4 and IPv6 address together as seen in the following example.
8787

8888
.. code-block:: shell
8989
@@ -153,7 +153,7 @@ hexadecimal characters. At vultr they said:
153153

154154
Your server was assigned the following six section subnet:
155155

156-
2001:19f0:6c01:114c:: / 64
156+
2001:19f0:6c01:114c::/64
157157

158158
The `vultr ipv6 subnet calculator
159159
<https://www.vultr.com/resources/subnet-calculator-ipv6/?prefix_length=64&display=long&ipv6_address=2001%3Adb8%3Aacad%3Ae%3A%3A%2F64>`_
@@ -260,7 +260,7 @@ bridge, use the ``-B`` option, an IP/netmask and external bridge.
260260
bastille create -B azkaban 13.2-RELEASE 192.168.1.50/24 bridge0
261261
262262
Bastille will automagically create the needed interface(s), attach it to the specified
263-
bridge and connect / disconnect containers as they are started and stopped.
263+
bridge and connect/disconnect containers as they are started and stopped.
264264
The bridge needs to be created/enabled before creating and starting the jail.
265265

266266
Below are the steps to creating a bridge for this purpose.
@@ -311,8 +311,8 @@ VLAN Configuration
311311

312312
Bastille supports VLANs to some extent when creating jails. When creating a jail, use
313313
the ``--vlan ID`` options to specify a VLAN ID for your jail. This will set the proper
314-
variables inside the jails `rc.conf` to add the jail to the specified VLAN. Using this method
315-
the bridge for the jail must carry tagged VLAN packets, e.g. you can bridge a VLAN trunk to
314+
variables inside the jails `rc.conf` to add the jail to the specified VLAN. When using this method,
315+
the interface being assigned must carry tagged VLAN packets, e.g. you can bridge a VLAN trunk to
316316
the jail and in the jail you then can access all VLANs. But be careful: This may have
317317
security implications.
318318

@@ -321,8 +321,8 @@ standard way of naming a VLAN interface. This is due to the limitations
321321
of the JIB script that Bastille uses to manage VNET jails.
322322

323323
You can however use ``-B|--bridge`` with VLAN interfaces (even with dots in the name).
324-
Using this method you create bridge interfaces in ``rc.conf`` and only add VLANs, that are needed
325-
for the jail. The jail only has access to this VLAN then and not to the whole trunk.
324+
Using this method you create bridge interfaces in ``rc.conf`` and only add VLANs that are needed
325+
for the jail. The jail only has access to these VLANs and not to the whole trunk.
326326
Below is an ``rc.conf`` snippet that was provided by a user who has such a configuration.
327327

328328
.. code-block:: shell

0 commit comments

Comments
 (0)