Skip to content

Commit

Permalink
Merge pull request #301 from cedwards/release-prep-20210101
Browse files Browse the repository at this point in the history
version bumps for release preparation
  • Loading branch information
cedwards authored Jan 1, 2021
2 parents c9b02fa + a0feac3 commit 7c271df
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Use "bastille command -h|--help" for more information about a command.

```

## 0.7-beta
## 0.8-beta
This document outlines the basic usage of the Bastille container management
framework. This release is still considered beta.

Expand Down
2 changes: 1 addition & 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.7.20200714`.
Current version is `0.8.20210101`.

To install from the FreeBSD package repository:

Expand Down
23 changes: 23 additions & 0 deletions docs/chapters/networking.rst
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,29 @@ Lastly, you may want to consider these three `sysctl` values:
net.link.bridge.pfil_onlyip=0
net.link.bridge.pfil_member=0
**Regarding Routes**

Bastille will attempt to auto-detect the default route from the host system and
assign it to the VNET container. This auto-detection may not always be accurate
for your needs for the particular container. In this case you'll need to add
a default route manually or define the preferred default route in the
`bastille.conf`.

.. code-block:: shell
bastille sysrc TARGET defaultrouter=aa.bb.cc.dd
bastille service TARGET routing restart
To define a default route / gateway for all VNET containers define the value in
`bastille.conf`:

.. code-block:: shell
bastille_network_gateway=aa.bb.cc.dd
This config change will apply the defined gateway to any new containers.
Existing containers will need to be manually updated.


Public Network
==============
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
author = 'Christer Edwards'

# The short X.Y version
version = '0.7.20200714'
version = '0.8.20210101'
# The full version, including alpha/beta/rc tags
release = '0.7.20200714-beta'
release = '0.8.20210101-beta'


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion usr/local/bin/bastille
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ bastille_perms_check() {
bastille_perms_check

## version
BASTILLE_VERSION="0.7.20200714"
BASTILLE_VERSION="0.8.20210101"

usage() {
cat << EOF
Expand Down

0 comments on commit 7c271df

Please sign in to comment.