diff --git a/docs/chapters/installation.rst b/docs/chapters/installation.rst index eafd01c3..d62553f3 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.8.20210115`. +Current version is `0.9.20210714`. To install from the FreeBSD package repository: diff --git a/docs/chapters/template.rst b/docs/chapters/template.rst index c92e3c7d..346920f6 100644 --- a/docs/chapters/template.rst +++ b/docs/chapters/template.rst @@ -7,14 +7,14 @@ Templates](https://gitlab.com/BastilleBSD-Templates)? Bastille supports a templating system allowing you to apply files, pkgs and execute commands inside the containers automatically. -Currently supported template hooks are: `LIMITS`, `INCLUDE`, `PRE`, `FSTAB`, -`PKG`, `OVERLAY`, `SYSRC`, `SERVICE`, `CMD`. +Currently supported template hooks are: `CMD`, `CP`, `INCLUDE`, `LIMITS`, `MOUNT`, +`PKG`, `RDR`, `SERVICE`, `SYSRC`. Templates are created in `${bastille_prefix}/templates` and can leverage any of the template hooks. -Bastille 0.7.x --------------- +Bastille 0.7.x+ +--------------- Bastille 0.7.x introduces a template syntax that is more flexible and allows any-order scripting. Previous versions had a hard template execution order and instructions were spread across multiple files. The new syntax is done in a @@ -27,23 +27,23 @@ Template Automation Hooks +---------+-------------------+-----------------------------------------+ | HOOK | format | example | +=========+===================+=========================================+ -| LIMITS | resource value | memoryuse 1G | +| CMD | /bin/sh command | /usr/bin/chsh -s /usr/local/bin/zsh | ++---------+-------------------+-----------------------------------------+ +| CP | path(s) | etc root usr (one per line) | +---------+-------------------+-----------------------------------------+ | INCLUDE | template path/URL | http?://TEMPLATE_URL or project/path | +---------+-------------------+-----------------------------------------+ -| PRE | /bin/sh command | mkdir -p /usr/local/my_app/html | +| LIMITS | resource value | memoryuse 1G | +---------+-------------------+-----------------------------------------+ -| FSTAB | fstab syntax | /host/path container/path nullfs ro 0 0 | +| MOUNT | fstab syntax | /host/path container/path nullfs ro 0 0 | +---------+-------------------+-----------------------------------------+ | PKG | port/pkg name(s) | vim-console zsh git-lite tree htop | +---------+-------------------+-----------------------------------------+ -| OVERLAY | path(s) | etc root usr (one per line) | -+---------+-------------------+-----------------------------------------+ -| SYSRC | sysrc command(s) | nginx_enable=YES | +| RDR | tcp port port | tcp 2200 22 (hostport jailport) | +---------+-------------------+-----------------------------------------+ | SERVICE | service command | 'nginx start' OR 'postfix reload' | +---------+-------------------+-----------------------------------------+ -| CMD | /bin/sh command | /usr/bin/chsh -s /usr/local/bin/zsh | +| SYSRC | sysrc command(s) | nginx_enable=YES | +---------+-------------------+-----------------------------------------+ Note: SYSRC requires that NO quotes be used or that quotes (`"`) be escaped @@ -71,7 +71,7 @@ use, be sure to include `usr` in the template OVERLAY definition. eg; .. code-block:: shell - echo "usr" > /usr/local/bastille/templates/username/template/OVERLAY + echo "CP usr" >> /usr/local/bastille/templates/username/template/Bastillefile The above example "usr" will include anything under "usr" inside the template. You do not need to list individual files. Just include the top-level directory diff --git a/docs/conf.py b/docs/conf.py index 09e8892c..9960669d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -12,9 +12,9 @@ author = 'Christer Edwards' # The short X.Y version -version = '0.8.20210115' +version = '0.9.20210714' # The full version, including alpha/beta/rc tags -release = '0.8.20210115-beta' +release = '0.8.20210714-beta' # -- General configuration --------------------------------------------------- diff --git a/usr/local/bin/bastille b/usr/local/bin/bastille index cf65d860..ac9a55c5 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.8.20210115" +BASTILLE_VERSION="0.9.20210714" usage() { cat << EOF diff --git a/usr/local/share/bastille/create.sh b/usr/local/share/bastille/create.sh index 2b796f48..767425fe 100644 --- a/usr/local/share/bastille/create.sh +++ b/usr/local/share/bastille/create.sh @@ -330,13 +330,6 @@ create_jail() { ## MAKE SURE WE'RE IN THE RIGHT PLACE cd "${bastille_jail_path}" echo - info "NAME: ${NAME}." - info "IP: ${IP}." - if [ -n "${INTERFACE}" ]; then - info "INTERFACE: ${INTERFACE}." - fi - info "RELEASE: ${RELEASE}." - echo if [ -z "${THICK_JAIL}" ]; then LINK_LIST="bin boot lib libexec rescue sbin usr/bin usr/include usr/lib usr/lib32 usr/libdata usr/libexec usr/sbin usr/share usr/src"