From a0feac3f669a6228087ef2a61351248799443d6d Mon Sep 17 00:00:00 2001 From: Christer Edwards Date: Fri, 1 Jan 2021 09:13:44 -0700 Subject: [PATCH] version bumps for release preparation --- README.md | 2 +- docs/chapters/installation.rst | 2 +- docs/chapters/networking.rst | 23 +++++++++++++++++++++++ docs/conf.py | 4 ++-- usr/local/bin/bastille | 2 +- 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 42cd325f..629c7695 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/docs/chapters/installation.rst b/docs/chapters/installation.rst index 19b89c85..25c1c852 100644 --- a/docs/chapters/installation.rst +++ b/docs/chapters/installation.rst @@ -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: diff --git a/docs/chapters/networking.rst b/docs/chapters/networking.rst index c476b3da..fb52e8a8 100644 --- a/docs/chapters/networking.rst +++ b/docs/chapters/networking.rst @@ -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 ============== diff --git a/docs/conf.py b/docs/conf.py index e8d83fbe..ca3c958e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -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 --------------------------------------------------- diff --git a/usr/local/bin/bastille b/usr/local/bin/bastille index 7f22b06b..46ec8f2d 100755 --- a/usr/local/bin/bastille +++ b/usr/local/bin/bastille @@ -70,7 +70,7 @@ bastille_perms_check() { bastille_perms_check ## version -BASTILLE_VERSION="0.7.20200714" +BASTILLE_VERSION="0.8.20210101" usage() { cat << EOF