prep & cleanup for 0.10.20231013 release

usr/local/bin/bastille

@@ -62,7 +62,7 @@ bastille_perms_check() {
 bastille_perms_check
 
 ## version
-BASTILLE_VERSION="0.10.20230714"
+BASTILLE_VERSION="0.10.20231013"
 
 usage() {
     cat << EOF
@@ -95,6 +95,7 @@ Available Commands:
   rename      Rename a container.
   restart     Restart a running container.
   service     Manage services within targeted container(s).
+  setup       Attempt to auto-configure network, firewall and storage on new installs.
   start       Start a stopped container.
   stop        Stop a running container.
   sysrc       Safely edit rc files within targeted container(s).

usr/local/share/bastille/setup.sh

@@ -96,14 +96,16 @@ configure_zfs() {
     if [ ! "$(kldstat -q -m zfs)" ]; then
         info "ZFS module not loaded; skipping..."
     else
+        ## attempt to determine bastille_zroot from `zpool list`
         bastille_zroot=$(zpool list | grep -v NAME | awk '{print $1}')
         sysrc -f "${bastille_prefix}/bastille.conf" bastille_zfs_enable=YES
         sysrc -f "${bastille_prefix}/bastille.conf" bastille_zfs_zpool="${bastille_zroot}"
     fi
 }
 
-# Run all functions if no args (default)
+# Run all base functions (w/o vnet) if no args
 if [ $# -eq 0 ]; then
+    sysrc bastille_enable=YES
     configure_bastille0
     configure_pf
     configure_zfs
@@ -117,10 +119,13 @@ help|-h|--help)
 pf|firewall)
     configure_pf
     ;;
-bastille0|network)
+bastille0|loopback)
     configure_bastille0
     ;;
-zfs)
+zfs|storage)
     configure_zfs
     ;;
+bastille1|vnet|bridge)
+    configure_vnet
+    ;;
 esac