Mirrors/BastilleBSD_bastille
1
0
Fork 1
mirror of https://github.com/BastilleBSD/bastille.git synced 2025-12-11 17:39:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to version 1.2.1

Browse Source
This commit is contained in:
tschettervictor
2025-12-03 11:14:22 -07:00
parent fc1ab8d859
commit f0789fa05a
6 changed files with 56 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -56,7 +56,7 @@ sysrc bastille_enable=YES
### Upgrading ### Upgrading
When upgrading from a previous version of bastille (e.g. 0.10.20230714 to When upgrading from a previous version of bastille (e.g. 0.10.20230714 to
1.1.3.251130) you will need to update your bastille.conf 1.2.1.251203) you will need to update your bastille.conf
Be sure to read the [Breaking Changes](#breaking-changes) below. Be sure to read the [Breaking Changes](#breaking-changes) below.

23
docs/chapters/configuration.rst
View File

@@ -17,7 +17,7 @@ This is the default `bastille.conf` file.
## [ BastilleBSD ] ## ## [ BastilleBSD ] ##
##################### #####################
## default paths ## Default paths
bastille_prefix="/usr/local/bastille" ## default: "/usr/local/bastille" bastille_prefix="/usr/local/bastille" ## default: "/usr/local/bastille"
bastille_backupsdir="${bastille_prefix}/backups" ## default: "${bastille_prefix}/backups" bastille_backupsdir="${bastille_prefix}/backups" ## default: "${bastille_prefix}/backups"
bastille_cachedir="${bastille_prefix}/cache" ## default: "${bastille_prefix}/cache" bastille_cachedir="${bastille_prefix}/cache" ## default: "${bastille_prefix}/cache"
@@ -29,20 +29,20 @@ This is the default `bastille.conf` file.
## pf configuration path ## pf configuration path
bastille_pf_conf="/etc/pf.conf" ## default: "/etc/pf.conf" bastille_pf_conf="/etc/pf.conf" ## default: "/etc/pf.conf"
## bastille scripts directory (assumed by bastille pkg) ## Bastille commands directory (assumed by bastille pkg)
bastille_sharedir="/usr/local/share/bastille" ## default: "/usr/local/share/bastille" bastille_sharedir="/usr/local/share/bastille" ## default: "/usr/local/share/bastille"
## bootstrap archives, which components of the OS to install. ## Bootstrap archives, which components of the OS to install.
## base - The base OS, kernel + userland ## base - The base OS, kernel + userland
## lib32 - Libraries for compatibility with 32 bit binaries ## lib32 - Libraries for compatibility with 32 bit binaries
## ports - The FreeBSD ports (3rd party applications) tree ## ports - The FreeBSD ports (3rd party applications) tree
## src - The source code to the kernel + userland ## src - The source code to the kernel + userland
## test - The FreeBSD test suite ## test - The FreeBSD test suite
## this is a whitespace separated list: ## Whitespace separated list:
## bastille_bootstrap_archives="base lib32 ports src test" ## bastille_bootstrap_archives="base lib32 ports src test"
bastille_bootstrap_archives="base" ## default: "base" bastille_bootstrap_archives="base" ## default: "base"
## pkgbase package sets (used for FreeBSD 15+) ## Pkgbase package sets
## Any set with [-dbg] can be installed with debugging ## Any set with [-dbg] can be installed with debugging
## symbols by adding '-dbg' to the package set ## symbols by adding '-dbg' to the package set
## base[-dbg] - Base system ## base[-dbg] - Base system
@@ -60,13 +60,13 @@ This is the default `bastille.conf` file.
## bastille_pkgbase_packages="base-jail lib32-dbg src" ## bastille_pkgbase_packages="base-jail lib32-dbg src"
bastille_pkgbase_packages="base-jail" ## default: "base-jail" bastille_pkgbase_packages="base-jail" ## default: "base-jail"
## default timezone ## Default timezone
bastille_tzdata="" ## default: empty to use host's time zone bastille_tzdata="" ## default: empty to use host's time zone
## default jail resolv.conf ## Default jail resolv.conf
bastille_resolv_conf="/etc/resolv.conf" ## default: "/etc/resolv.conf" bastille_resolv_conf="/etc/resolv.conf" ## default: "/etc/resolv.conf"
## bootstrap urls ## Bootstrap URLs
bastille_url_freebsd="http://ftp.freebsd.org/pub/FreeBSD/releases/" ## default: "http://ftp.freebsd.org/pub/FreeBSD/releases/" bastille_url_freebsd="http://ftp.freebsd.org/pub/FreeBSD/releases/" ## default: "http://ftp.freebsd.org/pub/FreeBSD/releases/"
bastille_url_hardenedbsd="https://installers.hardenedbsd.org/pub/" ## default: "https://installer.hardenedbsd.org/pub/HardenedBSD/releases/" bastille_url_hardenedbsd="https://installers.hardenedbsd.org/pub/" ## default: "https://installer.hardenedbsd.org/pub/HardenedBSD/releases/"
bastille_url_midnightbsd="https://www.midnightbsd.org/ftp/MidnightBSD/releases/" ## default: "https://www.midnightbsd.org/pub/MidnightBSD/releases/" bastille_url_midnightbsd="https://www.midnightbsd.org/ftp/MidnightBSD/releases/" ## default: "https://www.midnightbsd.org/pub/MidnightBSD/releases/"
@@ -75,16 +75,19 @@ This is the default `bastille.conf` file.
bastille_zfs_enable="NO" ## default: "NO" bastille_zfs_enable="NO" ## default: "NO"
bastille_zfs_zpool="" ## default: "" bastille_zfs_zpool="" ## default: ""
bastille_zfs_prefix="bastille" ## default: "bastille" bastille_zfs_prefix="bastille" ## default: "bastille"
bastille_zfs_options="-o compress=lz4 -o atime=off" ## default: "-o compress=lz4 -o atime=off" bastille_zfs_options="-o compress=on -o atime=off" ## default: "-o compress=on -o atime=off"
## Export/Import options ## Export/Import options
bastille_compress_xz_options="-0 -v" ## default "-0 -v" bastille_compress_xz_options="-0 -v" ## default "-0 -v"
bastille_decompress_xz_options="-c -d -v" ## default "-c -d -v" bastille_decompress_xz_options="-c -d -v" ## default "-c -d -v"
bastille_compress_gz_options="-1 -v" ## default "-1 -v" bastille_compress_gz_options="-1 -v" ## default "-1 -v"
bastille_decompress_gz_options="-k -d -c -v" ## default "-k -d -c -v" bastille_decompress_gz_options="-k -d -c -v" ## default "-k -d -c -v"
bastille_export_options="" ## default "" predefined export options, e.g. "--safe --gz" bastille_compress_zst_options="-3 -v" ## default "-3 -v"
bastille_decompress_zst_options="-k -d -c -v" ## default "-k -d -c -v"
bastille_export_options="" ## default "" predefined export options, e.g. "--live --gz"
## Networking ## Networking
bastille_network_vnet_type="if_bridge" ## default: "if_bridge"
bastille_network_loopback="bastille0" ## default: "bastille0" bastille_network_loopback="bastille0" ## default: "bastille0"
bastille_network_pf_ext_if="ext_if" ## default: "ext_if" bastille_network_pf_ext_if="ext_if" ## default: "ext_if"
bastille_network_pf_table="jails" ## default: "jails" bastille_network_pf_table="jails" ## default: "jails"

2
docs/chapters/installation.rst
View File

@@ -5,7 +5,7 @@ Bastille is available in the official FreeBSD ports tree at
``sysutils/bastille``. Binary packages are available in quarterly and latest ``sysutils/bastille``. Binary packages are available in quarterly and latest
repositories. repositories.
Current version is ``1.2.0.251201``. Current version is ``1.2.1.251203``.
To install from the FreeBSD package repository: To install from the FreeBSD package repository:

2
docs/chapters/usage.rst
View File

@@ -48,7 +48,7 @@ Usage
update Update jail base -pX release. update Update jail base -pX release.
upgrade Upgrade jail release to X.Y-RELEASE. upgrade Upgrade jail release to X.Y-RELEASE.
verify Compare release against a "known good" index. verify Compare release against a "known good" index.
zfs Manage (get|set) ZFS attributes on targeted container(s). zfs Manage (get|set) ZFS attributes on targeted jail(s).
Use "bastille -v|--version" for version information. Use "bastille -v|--version" for version information.
Use "bastille command -h|--help" for more information about a command. Use "bastille command -h|--help" for more information about a command.

4
docs/conf.py
View File

@@ -5,9 +5,9 @@ copyright = '2018-2025, Christer Edwards'
author = 'Christer Edwards' author = 'Christer Edwards'
# The short X.Y version # The short X.Y version
version = '1.2.0' version = '1.2.1'
# The full version, including alpha/beta/rc tags # The full version, including alpha/beta/rc tags
release = '1.2.0.251201' release = '1.2.1.251203'
# -- General configuration --------------------------------------------------- # -- General configuration ---------------------------------------------------

71
usr/local/bin/bastille
View File

@@ -32,7 +32,7 @@
PATH=${PATH}:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin PATH=${PATH}:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
BASTILLE_VERSION=1.2.0.251201 BASTILLE_VERSION=1.2.1.251203
# Validate config file # Validate config file
# Copy default when 'setup' is called # Copy default when 'setup' is called
@@ -73,52 +73,51 @@ Bastille is an open-source system for automating deployment and management of
containerized applications on FreeBSD. containerized applications on FreeBSD.
Usage: Usage:
bastille command [option(s)] TARGET [option(s)] ARGS bastille command [options(s)] TARGET [option(s)] [args]
Available Commands: Available Commands:
bootstrap Bootstrap a FreeBSD release for container base. bootstrap Bootstrap a release for jail base.
clone Clone an existing container. clone Clone an existing jail.
cmd Execute arbitrary command on targeted container(s). cmd Execute arbitrary command on targeted jail(s).
config Get or set a config value for the targeted container(s). config Get, set or remove a config value for the targeted jail(s).
console Console into a running container. console Console into a jail.
convert Convert a Thin container into a Thick container. convert Convert thin jail to thick jail, or convert a jail to a custom release.
cp cp(1) files from host to jail(s). cp cp(1) files from host to targeted jail(s).
create Create a new thin container or a thick container if -T|--thick option specified. create Create a jail.
destroy Destroy a stopped container or a FreeBSD release. destroy Destroy a jail or release.
edit Edit container configuration files (advanced). edit Edit jail configuration files (advanced).
etcupdate Update /etc directory to specified release. export Export a jail.
export Exports a specified container.
help Help about any command. help Help about any command.
htop Interactive process viewer (requires htop). htop Interactive process viewer (requires htop).
import Import a specified container. import Import a jail.
jcp cp(1) files from a jail to jail(s). jcp cp(1) files from a jail to jail(s).
limits Apply resources limits to targeted container(s). See rctl(8). limits Apply resources limits to targeted jail(s). See rctl(8) and cpuset(1).
list List containers. list List jails, releases, templates and more...
migrate Migrate targetted jail(s) to a remote system. migrate Migrate targeted jail(s) to a remote system.
mount Mount a volume inside the targeted container(s). mount Mount a volume inside targeted jail(s).
network Add/remove network interfaces from targeted container. network Add or remove interfaces from targeted jail(s).
pkg Manipulate binary packages within targeted container(s). See pkg(8). pkg Manipulate binary packages within targeted jail(s). See pkg(8).
rcp cp(1) files from a jail to host. rcp cp(1) files from a jail to host.
rdr Redirect host port to container port. rdr Redirect host port to jail port.
rename Rename a container. rename Rename a jail.
restart Restart a running container. restart Restart a jail.
service Manage services within targeted container(s). service Manage services within targeted jail(s).
setup Attempt to auto-configure network, firewall and storage on new installs. setup Attempt to auto-configure network, firewall and storage and more...
start Start a stopped container. start Start a stopped jail.
stop Stop a running container. stop Stop a running jail.
sysrc Safely edit rc files within targeted container(s). sysrc Safely edit rc files within targeted jail(s).
tags Add or remove tags to targeted container(s). tags Add or remove tags to targeted jail(s).
template Apply file templates to targeted container(s). template Apply file templates to targeted jail(s).
top Display and update information about the top(1) cpu processes. top Display and update information about the top(1) cpu processes.
umount Unmount a volume from within the targeted container(s). umount Unmount a volume from targeted jail(s).
update Update container base -pX release. update Update jail base -pX release.
upgrade Upgrade container release to X.Y-RELEASE. upgrade Upgrade jail release to X.Y-RELEASE.
verify Compare release against a "known good" index. verify Compare release against a "known good" index.
zfs Manage (get|set) ZFS attributes or snapshots on targeted container(s). zfs Manage (get|set) ZFS attributes on targeted jail(s).
Use "bastille -v|--version" for version information. Use "bastille -v|--version" for version information.
Use "bastille command -h|--help" for more information about a command. Use "bastille command -h|--help" for more information about a command.
Use "bastille -c|--config FILE command" to specify a non-default config file. Use "bastille -c|--config config.conf command" to specify a non-default config file.
EOF EOF
exit 1 exit 1