From 74d929c4a38532ffaced443a6669914b2b22572a Mon Sep 17 00:00:00 2001
From: JRGTH <joserprg@gmail.com>
Date: Fri, 6 Sep 2024 03:53:11 -0400
Subject: [PATCH] Update bastille config, use current extension path

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

diff --git a/CHANGELOG b/CHANGELOG
index 71f47e5..f5a3b0d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 ======================
 Version    Description
 
+1.1.36......Update bastille config, use current extension path.
 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.
diff --git a/bastille-init b/bastille-init
index aa54651..2fcdc21 100644
--- a/bastille-init
+++ b/bastille-init
@@ -1176,7 +1176,7 @@ rc_params()
 		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
+		sysrc -f ${BASTILLECONF} bastille_pf_conf="${CWDIR}/pf.conf" >/dev/null 2>&1
 	fi
 
 	# Set bastille.conf location.
diff --git a/conf/bastille.conf.ext b/conf/bastille.conf.ext
index 2c0cc8b..4ba7c65 100644
--- a/conf/bastille.conf.ext
+++ b/conf/bastille.conf.ext
@@ -5,7 +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_pf_conf="${bastille_prefix}/pf.conf"
 bastille_sharedir="/usr/local/share/bastille"
 bastille_bootstrap_archives="base"
 bastille_tzdata="etc/UTC"
diff --git a/version b/version
index 13fec67..df676e1 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.1.35
+1.1.36