bastille: Support user based config

This PR will allow bastille to be configured based on the user you run as. To load the config for a specifig user, you must be logged in as the specified user, and there must be a file called "bastille_user.conf" inside /usr/local/etc/bastille or else bastille will just load the default config file.
2026-01-03 19:23:42 +01:00 · 2025-03-01 18:48:14 -07:00
parent b614efd3ac
commit 6ba11dc762
36 changed files with 47 additions and 41 deletions
--- a/usr/local/share/bastille/bootstrap.sh
+++ b/usr/local/share/bastille/bootstrap.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
+load_config

 usage() {
    error_notify "Usage: bastille bootstrap [option(s)] [RELEASE|TEMPLATE] [update|arch]"
--- a/usr/local/share/bastille/clone.sh
+++ b/usr/local/share/bastille/clone.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
+load_config

 usage() {
    error_notify "Usage: bastille clone [option(s)] TARGET NEW_NAME IP_ADDRESS"
--- a/usr/local/share/bastille/cmd.sh
+++ b/usr/local/share/bastille/cmd.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
+load_config

 usage() {
    error_notify "Usage: bastille cmd [option(s)] TARGET command"
--- a/usr/local/share/bastille/common.sh
+++ b/usr/local/share/bastille/common.sh
@@ -30,11 +30,6 @@
 # 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
-if [ -f /usr/local/etc/bastille/bastille.conf ]; then
-    . /usr/local/etc/bastille/bastille.conf
-fi
-
 COLOR_RED=
 COLOR_GREEN=
 COLOR_YELLOW=
@@ -48,6 +43,18 @@ bastille_root_check() {
    fi
 }

+load_config() {
+    _user="$(id -un)"
+	if [ "${_user}" != "root" ] && [ -r "/usr/local/etc/bastille/bastille_${_user}.conf" ]; then
+	    . /usr/local/etc/bastille/bastille_${_user}.conf
+	else
+	    . /usr/local/etc/bastille/bastille.conf
+	fi
+}
+
+# Load configuration file
+load_config
+
 enable_color() {
    . /usr/local/share/bastille/colors.pre.sh
 }
--- a/usr/local/share/bastille/config.sh
+++ b/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
+load_config

 usage() {
    error_notify "Usage: bastille config TARGET [get|set] PROPERTY_NAME NEW_VALUE"
--- a/usr/local/share/bastille/console.sh
+++ b/usr/local/share/bastille/console.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
+load_config

 usage() {
    error_notify "Usage: bastille console [option(s)] TARGET [user]"
--- a/usr/local/share/bastille/convert.sh
+++ b/usr/local/share/bastille/convert.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
+load_config

 usage() {
    error_notify "Usage: bastille convert [option(s)] TARGET"
--- a/usr/local/share/bastille/cp.sh
+++ b/usr/local/share/bastille/cp.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
+load_config

 usage() {
    error_notify "Usage: bastille cp [option(s)] TARGET HOST_PATH JAIL_PATH"
--- a/usr/local/share/bastille/create.sh
+++ b/usr/local/share/bastille/create.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
+load_config

 usage() {
    # Build an independent usage for the create command
--- a/usr/local/share/bastille/destroy.sh
+++ b/usr/local/share/bastille/destroy.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
+load_config

 usage() {
    error_notify "Usage: bastille destroy [option(s)] [JAIL|RELEASE]"
--- a/usr/local/share/bastille/edit.sh
+++ b/usr/local/share/bastille/edit.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
+load_config

 usage() {
    error_notify "Usage: bastille edit [option(s)] TARGET [filename]"
--- a/usr/local/share/bastille/etcupdate.sh
+++ b/usr/local/share/bastille/etcupdate.sh
@@ -28,7 +28,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
+load_config

 usage() {
    error_notify "Usage: bastille etcupdate [option(s)] [bootstrap|TARGET] [diff|resolve|update RELEASE]"
--- a/usr/local/share/bastille/export.sh
+++ b/usr/local/share/bastille/export.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
+load_config

 usage() {
    # Build an independent usage for the export command
--- a/usr/local/share/bastille/htop.sh
+++ b/usr/local/share/bastille/htop.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
+load_config

 usage() {
    error_notify "Usage: bastille htop [option(s)] TARGET"
--- a/usr/local/share/bastille/import.sh
+++ b/usr/local/share/bastille/import.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
+load_config

 usage() {
    # Build an independent usage for the import command
--- a/usr/local/share/bastille/jcp.sh
+++ b/usr/local/share/bastille/jcp.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
+load_config

 usage() {
    error_notify "Usage: bastille jcp [option(s)] SOURCE_JAIL JAIL_PATH DEST_JAIL JAIL_PATH"
--- a/usr/local/share/bastille/limits.sh
+++ b/usr/local/share/bastille/limits.sh
@@ -32,7 +32,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
+load_config

 usage() {
    error_notify "Usage: bastille limits [option(s)] TARGET OPTION VALUE"
--- a/usr/local/share/bastille/list.sh
+++ b/usr/local/share/bastille/list.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
+load_config

 usage() {
    error_notify "Usage: bastille list [option(s)] [-j|-a] [RELEASE (-p)] [template] [JAIL|CONTAINER] [log] [limit] [import] [export] [backup]"
--- a/usr/local/share/bastille/mount.sh
+++ b/usr/local/share/bastille/mount.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
+load_config

 usage() {
    error_notify "Usage: bastille mount [option(s)] TARGET HOST_PATH JAIL_PATH [filesystem_type options dump pass_number]"
--- a/usr/local/share/bastille/pkg.sh
+++ b/usr/local/share/bastille/pkg.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
+load_config

 usage() {
    error_notify "Usage: bastille pkg [option(s)] TARGET COMMAND args"
--- a/usr/local/share/bastille/rcp.sh
+++ b/usr/local/share/bastille/rcp.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
+load_config

 usage() {
    error_notify "Usage: bastille rcp [option(s)] TARGET JAIL_PATH HOST_PATH"
--- a/usr/local/share/bastille/rdr.sh
+++ b/usr/local/share/bastille/rdr.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
+load_config

 usage() {
    error_notify "Usage: bastille rdr [option(s)] TARGET [clear|reset|list|(tcp|udp)] HOST_PORT JAIL_PORT [log ['(' logopts ')'] ]"
--- a/usr/local/share/bastille/rename.sh
+++ b/usr/local/share/bastille/rename.sh
@@ -29,7 +29,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
+load_config

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

 . /usr/local/share/bastille/common.sh
+load_config

 usage() {
    error_notify "Usage: bastille service [options(s)] TARGET SERVICE_NAME ACTION"
--- a/usr/local/share/bastille/setup.sh
+++ b/usr/local/share/bastille/setup.sh
@@ -30,10 +30,8 @@
 # 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}
+load_config

 usage() {
    error_exit "Usage: bastille setup [pf|network|zfs|vnet]"
--- a/usr/local/share/bastille/start.sh
+++ b/usr/local/share/bastille/start.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
+load_config

 usage() {
    error_notify "Usage: bastille start [option(s)] TARGET"
--- a/usr/local/share/bastille/stop.sh
+++ b/usr/local/share/bastille/stop.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
+load_config

 usage() {
    error_notify "Usage: bastille stop [option(s)] TARGET"
--- a/usr/local/share/bastille/sysrc.sh
+++ b/usr/local/share/bastille/sysrc.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
+load_config

 usage() {
    error_notify "Usage: bastille sysrc [option(s)] TARGET args"
--- a/usr/local/share/bastille/tags.sh
+++ b/usr/local/share/bastille/tags.sh
@@ -32,7 +32,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
+load_config

 usage() {
    error_notify "Usage: bastille tags TARGET [add|delete|list] [tag1,tag2]"
--- a/usr/local/share/bastille/template.sh
+++ b/usr/local/share/bastille/template.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
+load_config

 usage() {
    error_notify "Usage: bastille template [option(s)] TARGET [--convert|project/template]"
--- a/usr/local/share/bastille/top.sh
+++ b/usr/local/share/bastille/top.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
+load_config

 usage() {
    error_notify "Usage: bastille top [options(s)] TARGET"
--- a/usr/local/share/bastille/umount.sh
+++ b/usr/local/share/bastille/umount.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
+load_config

 usage() {
    error_notify "Usage: bastille umount [option(s)] TARGET JAIL_PATH"
--- a/usr/local/share/bastille/update.sh
+++ b/usr/local/share/bastille/update.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
+load_config

 usage() {
    error_notify "Usage: bastille update [option(s)] TARGET"
--- a/usr/local/share/bastille/upgrade.sh
+++ b/usr/local/share/bastille/upgrade.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
+load_config

 usage() {
    error_notify "Usage: bastille upgrade [option(s)] TARGET [NEWRELEASE|install]"
--- a/usr/local/share/bastille/verify.sh
+++ b/usr/local/share/bastille/verify.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
+load_config

 usage() {
    error_notify "Usage: bastille verify [RELEASE|TEMPLATE]"
--- a/usr/local/share/bastille/zfs.sh
+++ b/usr/local/share/bastille/zfs.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
+load_config

 usage() {
    error_notify "Usage: bastille zfs TARGET [set|get|snap|destroy_snap|df|usage] [key=value|date]"