Merge pull request #895 from tschettervictor/custom-config

bastille: Support user based config

README.md

@@ -95,6 +95,7 @@ Available Commands:
 
 Use "bastille -v|--version" for version information.
 Use "bastille command -h|--help" for more information about a command.
+Use "bastille [-c|--config FILE] command" to specify a non-default config file.
 
 ```
 

docs/chapters/configuration.rst

@@ -0,0 +1,106 @@
+Configuration
+=============
+
+Bastille is configured using a default config file located at `/usr/local/etc/bastille/bastille.conf`. When first installing
+bastille, you will be asked if you want to copy the sample config file to this location. The default are sensible for UFS, but
+if you want to use ZFS, you will have to change a few options. See the chapter on ZFS Support.
+
+This is the default `bastille.conf` file.
+
+.. code-block:: shell
+
+  #####################
+  ## [ BastilleBSD ] ##
+  #####################
+
+  ## default paths
+  bastille_prefix="/usr/local/bastille"                                 ## default: "/usr/local/bastille"
+  bastille_backupsdir="${bastille_prefix}/backups"                      ## default: "${bastille_prefix}/backups"
+  bastille_cachedir="${bastille_prefix}/cache"                          ## default: "${bastille_prefix}/cache"
+  bastille_jailsdir="${bastille_prefix}/jails"                          ## default: "${bastille_prefix}/jails"
+  bastille_releasesdir="${bastille_prefix}/releases"                    ## default: "${bastille_prefix}/releases"
+  bastille_templatesdir="${bastille_prefix}/templates"                  ## default: "${bastille_prefix}/templates"
+  bastille_logsdir="/var/log/bastille"                                  ## default: "/var/log/bastille"
+
+  ## pf configuration path
+  bastille_pf_conf="/etc/pf.conf"                                       ## default: "/etc/pf.conf"
+
+  ## bastille scripts directory (assumed by bastille pkg)
+  bastille_sharedir="/usr/local/share/bastille"                         ## default: "/usr/local/share/bastille"
+
+  ## bootstrap archives, which components of the OS to install.
+  ## base  - The base OS, kernel + userland
+  ## lib32 - Libraries for compatibility with 32 bit binaries
+  ## ports - The FreeBSD ports (3rd party applications) tree
+  ## src   - The source code to the kernel + userland
+  ## test  - The FreeBSD test suite
+  ## this is a whitespace separated list:
+  ## bastille_bootstrap_archives="base lib32 ports src test"
+  bastille_bootstrap_archives="base"                                    ## default: "base"
+
+  ## default timezone
+  bastille_tzdata=""                                                    ## default: empty to use host's time zone
+
+  ## default jail resolv.conf
+  bastille_resolv_conf="/etc/resolv.conf"                               ## default: "/etc/resolv.conf"
+
+  ## bootstrap urls
+  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_midnightbsd="https://www.midnightbsd.org/ftp/MidnightBSD/releases/"          ## default: "https://www.midnightbsd.org/pub/MidnightBSD/releases/"
+
+  ## ZFS options
+  bastille_zfs_enable="NO"                                              ## default: "NO"
+  bastille_zfs_zpool=""                                                 ## default: ""
+  bastille_zfs_prefix="bastille"                                        ## default: "bastille"
+  bastille_zfs_options="-o compress=lz4 -o atime=off"                   ## default: "-o compress=lz4 -o atime=off"
+
+  ## Export/Import options
+  bastille_compress_xz_options="-0 -v"                                  ## default "-0 -v"
+  bastille_decompress_xz_options="-c -d -v"                             ## default "-c -d -v"
+  bastille_compress_gz_options="-1 -v"                                  ## default "-1 -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"
+
+  ## Networking
+  bastille_network_loopback="bastille0"                                 ## default: "bastille0"
+  bastille_network_pf_ext_if="ext_if"                                   ## default: "ext_if"
+  bastille_network_pf_table="jails"                                     ## default: "jails"
+  bastille_network_shared=""                                            ## default: ""
+  bastille_network_gateway=""                                           ## default: ""
+  bastille_network_gateway6=""                                          ## default: ""
+
+  ## Default Templates
+  bastille_template_base="default/base"                                 ## default: "default/base"
+  bastille_template_empty=""                                            ## default: "default/empty"
+  bastille_template_thick="default/thick"                               ## default: "default/thick"
+  bastille_template_clone="default/clone"                               ## default: "default/clone"
+  bastille_template_thin="default/thin"                                 ## default: "default/thin"
+  bastille_template_vnet="default/vnet"                                 ## default: "default/vnet"
+
+Notes
+-----
+
+The options here are fairly self-explanitory, but there are some things to note.
+
+* If you use ZFS, DO NOT create the bastille dataset. You must only create the parent. Bastille must be allowed to create the `bastille` child dataset, or you will have issues. So, if you want bastille to live at `zroot/data/bastille` you should set `bastille_zfs_zpool` to `zroot` and `bastille_zfs_prefix` to `data/bastille` but you should only create `zroot/data` before running bastille for the first time.
+
+* Bastille will mount the dataset it creates at `bastille_prefix` which defaults to `/usr/local/bastille`. So if you want to navigate to your jails, you will use the `bastille_prefix` as the location because this is where the will be mounted.
+
+Custom Configuration
+--------------------
+
+Bastille now supports using a custom config in addition to the default one. This is nice if you have multiple users, or want to store different
+jails at different locations based on your needs.
+
+Simply copy the default config file and edit it according to your new environment or user. Then, it can be used in a couple of ways.
+
+1. Run Bastille using `bastille --config /path/to/config.conf bootstrap 14.2-RELEASE` to bootstrap the release using the new config.
+
+2. As a specific user, export the `BASTILLE_CONFIG` variable using `export BASTILLE_CONFIG=/path/to/config.conf`. This config will then always be used when running Bastille with that user. See notes below...
+
+- Exporting the `BASTILLE_CONFIG` variable will only export it for the current session. If you want to persist the export, see documentation for the shell that you use.
+
+- If you use sudo, you will need to run it with `sudo -E bastille bootstrap...` to preserve your users environment. This can also be persisted by editing the sudoers file.
+
+- If you do set the `BASTILLE_CONFIG` variable, you do not need to specify the config file when running Bastille as that specified user.

docs/chapters/gettingstarted.rst

@@ -1,4 +1,3 @@
-===============
 Getting Started
 ===============
 

docs/chapters/usage.rst

@@ -1,4 +1,3 @@
-=====
 Usage
 =====
 
@@ -51,4 +50,4 @@ Usage
 
   Use "bastille -v|--version" for version information.
   Use "bastille command -h|--help" for more information about a command.
-
+  Use "bastille [-c|--config FILE] command" to specify a non-default config file.

docs/index.rst

@@ -13,6 +13,7 @@ https://docs.bastillebsd.org.
 
    chapters/installation
    chapters/gettingstarted
+   chapters/configuration
    chapters/upgrading
    chapters/networking
    chapters/usage

usr/local/bin/bastille

@@ -32,6 +32,8 @@
 
 PATH=${PATH}:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
 
+BASTILLE_VERSION="0.13.20250126"
+
 ## check for config existence
 bastille_conf_check() {
     if [ ! -r "/usr/local/etc/bastille/bastille.conf" ]; then
@@ -54,12 +56,6 @@ bastille_conf_check() {
     fi
 }
 
-bastille_conf_check
-
-## we only load this if conf_check passes
-. /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
-
 ## bastille_prefix should be 0750
 ## this restricts file system access to privileged users
 bastille_perms_check() {
@@ -72,18 +68,13 @@ bastille_perms_check() {
     fi
 }
 
-bastille_perms_check
-
-## version
-BASTILLE_VERSION="0.13.20250126"
-
 usage() {
     cat << EOF
 Bastille is an open-source system for automating deployment and management of
 containerized applications on FreeBSD.
 
 Usage:
-  bastille command TARGET [args]
+  bastille command [option(s)] TARGET [args]
 
 Available Commands:
   bootstrap   Bootstrap a FreeBSD release for container base.
@@ -127,11 +118,70 @@ Available Commands:
 
 Use "bastille -v|--version" for version information.
 Use "bastille command -h|--help" for more information about a command.
+Use "bastille [-c|--config FILE] command" to specify a non-default config file.
 
 EOF
     exit 1
 }
 
+bastille_conf_check
+bastille_perms_check
+
+if [ -z "${BASTILLE_CONFIG}" ]; then
+    BASTILLE_CONFIG=/usr/local/etc/bastille/bastille.conf
+    export BASTILLE_CONFIG
+elif [ -r "${BASTILLE_CONFIG}" ]; then
+    export BASTILLE_CONFIG
+elif [ -r "/usr/local/etc/bastille/${BASTILLE_CONFIG}" ]; then
+    BASTILLE_CONFIG="/usr/local/etc/bastille/${BASTILLE_CONFIG}"
+    export BASTILLE_CONFIG
+else
+    echo "Not a valid config file: ${BASTILLE_CONFIG}"
+    exit 1
+fi   
+
+# Load common.sh after setting BASTILLE_CONFIG
+. /usr/local/share/bastille/common.sh
+
+# Handle options
+while [ "$#" -gt 0 ]; do
+    case "${1}" in
+        -h|--help|help)
+            usage
+            ;;
+        version|-v|--version)
+            info "${BASTILLE_VERSION}"
+            exit 0
+            ;;
+        -c|--config)
+            BASTILLE_CONFIG="${2}"
+            if [ -r "${BASTILLE_CONFIG}" ]; then
+                info "Using custom config: ${BASTILLE_CONFIG}"
+                export BASTILLE_CONFIG
+            elif [ -r "/usr/local/etc/bastille/${BASTILLE_CONFIG}" ]; then
+                BASTILLE_CONFIG="/usr/local/etc/bastille/${BASTILLE_CONFIG}"
+                info "Using custom config: ${BASTILLE_CONFIG}"
+                export BASTILLE_CONFIG
+            else
+                error_exit "Not a valid config file: ${BASTILLE_CONFIG}"
+            fi                
+            shift 2
+            ;;
+        -*)
+            for _opt in $(echo ${1} | sed 's/-//g' | fold -w1); do
+                case ${_opt} in
+                    x) enable_debug ;;
+                    a) AUTO=1 ;;
+                    *) error_exit "Unknown Option: \"${1}\"" ;; 
+                esac
+            done
+            shift
+            ;;
+        *)
+            break
+            ;;
+    esac
+done
 if [ "$#" -lt 1 ]; then
     usage
 else
@@ -141,13 +191,6 @@ fi
 
 # Handle special-case commands first.
 case "${CMD}" in
-    version|-v|--version)
-        info "${BASTILLE_VERSION}"
-        exit 0
-        ;;
-    help|-h|--help)
-        usage
-        ;;
     bootstrap| \
     clone| \
     cmd| \

usr/local/share/bastille/bootstrap.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille bootstrap [option(s)] [RELEASE|TEMPLATE] [update|arch]"

usr/local/share/bastille/clone.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille clone [option(s)] TARGET NEW_NAME IP_ADDRESS"

usr/local/share/bastille/cmd.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille cmd [option(s)] TARGET command"

usr/local/share/bastille/common.sh

@@ -30,11 +30,11 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Source config file
+# Load config. This only has to be done here
-if [ -f /usr/local/etc/bastille/bastille.conf ]; then
+# because all commands load this file
-    . /usr/local/etc/bastille/bastille.conf
+# shellcheck disable=SC1090
-fi
+. ${BASTILLE_CONFIG}
-
+	
 COLOR_RED=
 COLOR_GREEN=
 COLOR_YELLOW=

usr/local/share/bastille/config.sh

@@ -31,7 +31,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
+
 
 usage() {
     error_notify "Usage: bastille config TARGET [get|set] PROPERTY_NAME NEW_VALUE"

usr/local/share/bastille/console.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille console [option(s)] TARGET [user]"

usr/local/share/bastille/convert.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille convert [option(s)] TARGET"

usr/local/share/bastille/cp.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille cp [option(s)] TARGET HOST_PATH JAIL_PATH"

usr/local/share/bastille/create.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     # Build an independent usage for the create command

usr/local/share/bastille/destroy.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille destroy [option(s)] [JAIL|RELEASE]"

usr/local/share/bastille/edit.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille edit [option(s)] TARGET [filename]"

usr/local/share/bastille/etcupdate.sh

@@ -28,7 +28,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille etcupdate [option(s)] [bootstrap|TARGET] [diff|resolve|update RELEASE]"

usr/local/share/bastille/export.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     # Build an independent usage for the export command

usr/local/share/bastille/htop.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille htop [option(s)] TARGET"

usr/local/share/bastille/import.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     # Build an independent usage for the import command

usr/local/share/bastille/jcp.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille jcp [option(s)] SOURCE_JAIL JAIL_PATH DEST_JAIL JAIL_PATH"

usr/local/share/bastille/limits.sh

@@ -32,7 +32,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille limits [option(s)] TARGET OPTION VALUE"

usr/local/share/bastille/list.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille list [option(s)] [-j|-a] [RELEASE (-p)] [template] [JAIL|CONTAINER] [log] [limit] [import] [export] [backup]"

usr/local/share/bastille/mount.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille mount [option(s)] TARGET HOST_PATH JAIL_PATH [filesystem_type options dump pass_number]"

usr/local/share/bastille/pkg.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille pkg [option(s)] TARGET COMMAND args"

usr/local/share/bastille/rcp.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille rcp [option(s)] TARGET JAIL_PATH HOST_PATH"

usr/local/share/bastille/rdr.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille rdr [option(s)] TARGET [clear|reset|list|(tcp|udp)] HOST_PORT JAIL_PORT [log ['(' logopts ')'] ]"

usr/local/share/bastille/rename.sh

@@ -29,7 +29,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille rename [option(s)] TARGET NEW_NAME"

usr/local/share/bastille/setup.sh

@@ -30,10 +30,7 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-bastille_config="/usr/local/etc/bastille/bastille.conf"
 . /usr/local/share/bastille/common.sh
-# shellcheck source=/usr/local/etc/bastille/bastille.conf
-. ${bastille_config}
 
 usage() {
     error_exit "Usage: bastille setup [pf|network|zfs|vnet]"

usr/local/share/bastille/start.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille start [option(s)] TARGET"

usr/local/share/bastille/stop.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille stop [option(s)] TARGET"

usr/local/share/bastille/sysrc.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille sysrc [option(s)] TARGET args"

usr/local/share/bastille/tags.sh

@@ -32,7 +32,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille tags TARGET [add|delete|list] [tag1,tag2]"

usr/local/share/bastille/template.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille template [option(s)] TARGET [--convert|project/template]"

usr/local/share/bastille/top.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille top [options(s)] TARGET"

usr/local/share/bastille/umount.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille umount [option(s)] TARGET JAIL_PATH"

usr/local/share/bastille/update.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille update [option(s)] TARGET"

usr/local/share/bastille/upgrade.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille upgrade [option(s)] TARGET [NEWRELEASE|install]"

usr/local/share/bastille/verify.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille verify [RELEASE|TEMPLATE]"

usr/local/share/bastille/zfs.sh

@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 . /usr/local/share/bastille/common.sh
-. /usr/local/etc/bastille/bastille.conf
 
 usage() {
     error_notify "Usage: bastille zfs TARGET [set|get|snap|destroy_snap|df|usage] [key=value|date]"