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

update documentation for 14.0-RELEASE #637

Merged
merged 1 commit into from
Nov 24, 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
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ make install
**enable at boot**
```shell
sysrc bastille_enable=YES
sysrc bastille_list="azkaban alcatraz" # (optional whitelist of jails to start at boot; default: ALL)
sysrc bastille_rcorder=YES
```

Upgrading from a previous version
Expand All @@ -40,7 +40,7 @@ When upgrading from a previous version of bastille (e.g. 0.10.20230714 to

```shell
cd /usr/local/etc/bastille
vimdiff bastille.conf bastille.conf.sample
diff -u bastille.conf bastille.conf.sample
```

Merge the lines that are present in the new bastille.conf.sample into
Expand Down Expand Up @@ -75,6 +75,7 @@ Available Commands:
mount Mount a volume inside the targeted container(s).
pkg Manipulate binary packages within targeted container(s). See pkg(8).
rdr Redirect host port to container port.
rcp reverse cp(1) files from a single container to the host.
rename Rename a container.
restart Restart a running container.
service Manage services within targeted container(s).
Expand Down Expand Up @@ -131,7 +132,7 @@ Example (create, start, console)
This example creates, starts and consoles into the container.

```shell
ishmael ~ # bastille create alcatraz 13.2-RELEASE 10.17.89.10
ishmael ~ # bastille create alcatraz 14.0-RELEASE 10.17.89.10/24
```

```shell
Expand All @@ -143,7 +144,7 @@ alcatraz: created
```shell
ishmael ~ # bastille console alcatraz
[alcatraz]:
FreeBSD 13.2-RELEASE-p4 GENERIC
FreeBSD 14.0-RELEASE GENERIC

Welcome to FreeBSD!

Expand Down
5 changes: 4 additions & 1 deletion docs/chapters/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bastille is available in the official FreeBSD ports tree at
`sysutils/bastille`. Binary packages available in `quarterly` and `latest`
repositories.

Current version is `0.10.20231013`.
Current version is `0.10.20231125`.

To install from the FreeBSD package repository:

Expand All @@ -19,6 +19,7 @@ PKG

pkg install bastille
sysrc bastille_enable=YES
sysrc bastille_rcorder=YES


To install from source (don't worry, no compiling):
Expand All @@ -30,6 +31,7 @@ ports

make -C /usr/ports/sysutils/bastille install clean
sysrc bastille_enable=YES
sysrc bastille_rcorder=YES


GIT
Expand All @@ -41,6 +43,7 @@ GIT
cd bastille
make install
sysrc bastille_enable=YES
sysrc bastille_rcorder=YES

This method will install the latest files from GitHub directly onto your
system. It is verbose about the files it installs (for later removal), and also
Expand Down
7 changes: 5 additions & 2 deletions docs/chapters/networking.rst
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,11 @@ host system:
## /etc/devfs.rules (NOT .conf)

[bastille_vnet=13]
add include $devfsrules_hide_all
add include $devfsrules_unhide_basic
add include $devfsrules_unhide_login
add include $devfsrules_jail
add include $devfsrules_jail_vnet
add path 'bpf*' unhide

Lastly, you may want to consider these three `sysctl` values:
Expand Down Expand Up @@ -155,8 +160,6 @@ Below is the definition of what these three parameters are used for and mean:
interface, set to 0 to disable it.




**Regarding Routes**

Bastille will attempt to auto-detect the default route from the host system and
Expand Down
2 changes: 1 addition & 1 deletion usr/local/bin/bastille
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ bastille_perms_check() {
bastille_perms_check

## version
BASTILLE_VERSION="0.10.20231013"
BASTILLE_VERSION="0.10.20231125"

usage() {
cat << EOF
Expand Down