From 2222468a36884114735f8efc058931fe22dd5da1 Mon Sep 17 00:00:00 2001
From: JRGTH <joserprg@gmail.com>
Date: Fri, 6 Sep 2024 03:41:55 -0400
Subject: [PATCH] Update bastille config

---
 CHANGELOG                 | 1 +
 bastille-init             | 3 +++
 conf/bastille.conf.ext    | 1 +
 conf/bastille.conf.sample | 9 +++++----
 version                   | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index e30fbb5..71f47e5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 ======================
 Version    Description
 
+1.1.35......Update bastille config.
 1.1.34......Add option to create externally bridged vnet jails thought the webgui.
 1.1.33......Update: Add support for 14.0 and 14.1 releases.
 1.1.32......Update release list, tarballs.php to include 13.3.
diff --git a/bastille-init b/bastille-init
index 9962657..aa54651 100644
--- a/bastille-init
+++ b/bastille-init
@@ -1175,6 +1175,9 @@ rc_params()
 	if ! sysrc -f ${BASTILLECONF} -qc bastille_decompress_gz_options; then
 		sysrc -f ${BASTILLECONF} bastille_decompress_gz_options="-k -d -c -v" >/dev/null 2>&1
 	fi
+	if ! sysrc -f ${BASTILLECONF} -qc bastille_pf_conf; then
+		sysrc -f ${BASTILLECONF} bastille_pf_conf="/etc/pf.conf" >/dev/null 2>&1
+	fi
 
 	# Set bastille.conf location.
 	if ! sysrc -f ${CWDIR}${EXTCONF} -n BASTILLE_CONFIG 2>/dev/null | grep -q "${CWDIR}/${FULLAPPNAME}${BASTILLECONF}"; then
diff --git a/conf/bastille.conf.ext b/conf/bastille.conf.ext
index c1bb5f0..2c0cc8b 100644
--- a/conf/bastille.conf.ext
+++ b/conf/bastille.conf.ext
@@ -5,6 +5,7 @@ bastille_jailsdir="${bastille_prefix}/jails"
 bastille_releasesdir="${bastille_prefix}/releases"
 bastille_templatesdir="${bastille_prefix}/templates"
 bastille_logsdir="${bastille_prefix}/logs"
+bastille_pf_conf="/etc/pf.conf"
 bastille_sharedir="/usr/local/share/bastille"
 bastille_bootstrap_archives="base"
 bastille_tzdata="etc/UTC"
diff --git a/conf/bastille.conf.sample b/conf/bastille.conf.sample
index dd62eca..2d3d207 100644
--- a/conf/bastille.conf.sample
+++ b/conf/bastille.conf.sample
@@ -11,6 +11,9 @@ bastille_releasesdir="${bastille_prefix}/releases"                    ## default
 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"
 
@@ -30,9 +33,6 @@ bastille_tzdata=""                                                    ## default
 ## default jail resolv.conf
 bastille_resolv_conf="/etc/resolv.conf"                               ## default: "/etc/resolv.conf"
 
-## default output colors
-bastille_colors_enable=""                                             ## default: "YES"
-
 ## 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/"
@@ -41,7 +41,7 @@ bastille_url_midnightbsd="https://www.midnightbsd.org/ftp/MidnightBSD/releases/"
 ## ZFS options
 bastille_zfs_enable=""                                                ## default: ""
 bastille_zfs_zpool=""                                                 ## default: ""
-bastille_zfs_prefix="bastille"                                        ## default: "${bastille_zfs_zpool}/bastille"
+bastille_zfs_prefix="${bastille_zfs_zpool}/bastille"                  ## default: "${bastille_zfs_zpool}/bastille"
 bastille_zfs_options="-o compress=lz4 -o atime=off"                   ## default: "-o compress=lz4 -o atime=off"
 
 ## Export/Import options
@@ -49,6 +49,7 @@ bastille_compress_xz_options="-0 -v"                                  ## default
 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"
diff --git a/version b/version
index 73a29c9..13fec67 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.1.34
+1.1.35