From 55d7978cce968f817f258a86406d93ff6ebf4cff Mon Sep 17 00:00:00 2001
From: Jose <joserprg@gmail.com>
Date: Sun, 9 Feb 2020 09:45:16 -0400
Subject: [PATCH] Remove obsolete code, update config

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

diff --git a/CHANGELOG b/CHANGELOG
index b36691b..9d66363 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 ======================
 Version    Description
 
+1.0.36......Remove obsolete code, update config.
 1.0.35......Use bastille built-in convert function.
 1.0.34......Use bastille built-in export/import functions.
 1.0.33......Use rsync during jail conversion.
diff --git a/bastille-init b/bastille-init
index 1eebe14..de56b99 100755
--- a/bastille-init
+++ b/bastille-init
@@ -53,10 +53,6 @@ SCRIPTNAME=$(basename $0)
 CONFIG="/cf/conf/config.xml"
 PRDNAME="Bastille"
 APPNAME="bastille"
-DEF_ZFS_SENDPARAMS=""
-DEF_ZFS_RECVPARAM=""
-DEF_ZFS_COMPRESS="xz -0 -v --threads=0"
-DEF_ZFS_DECOMPRESS="xz -c -d -v --threads=0"
 EXTLOGFILE="${CWDIR}/log/bastille_ext.log"
 FULLAPPNAME="${APPNAME}-dist"
 WWWPATH="/usr/local/www"
@@ -79,7 +75,6 @@ BASTILE_VERSION="https://raw.githubusercontent.com/BastilleBSD/${APPNAME}/${BRAN
 GITURL="https://github.com/JRGTH/xigmanas-${APPNAME}-extension/archive/${BRANCH}.zip"
 VERFILE="https://raw.githubusercontent.com/JRGTH/xigmanas-${APPNAME}-extension/${BRANCH}/version"
 OPT="${1}"
-NAME="${2}"
 
 # Required
 if [ -f "${BASTILLECONF}" ]; then
@@ -124,21 +119,7 @@ runtime_config()
 	FREEBSD_UPDATE_PERMS=$(stat -f "%Op" ${FREEBSD_UPDATE}/freebsd-update)
 	if [ "${FREEBSD_UPDATE_PERMS}" != 100555 ]; then
 		chmod 0555 ${FREEBSD_UPDATE}/freebsd-update
-	fi
-
-	# Set rquired zfs send/recv parameters is missing.
-	if ! grep -qw "ZFS_SENDPARAMS=" ${CWDIR}${EXTCONF} >/dev/null 2>&1; then
-		sysrc -f ${CWDIR}${EXTCONF} ZFS_SENDPARAMS="${DEF_ZFS_SENDPARAMS}" >/dev/null 2>&1
-	fi
-	if ! grep -qw "ZFS_RECVPARAM=" ${CWDIR}${EXTCONF} >/dev/null 2>&1; then
-		sysrc -f ${CWDIR}${EXTCONF} ZFS_RECVPARAM="${DEF_ZFS_RECVPARAM}" >/dev/null 2>&1
-	fi
-	if ! grep -qw "DEFAULT_COMPRESS=" ${CWDIR}${EXTCONF} >/dev/null 2>&1; then
-		sysrc -f ${CWDIR}${EXTCONF} ZFS_COMPRESS="${DEF_ZFS_COMPRESS}" >/dev/null 2>&1
-	fi
-	if ! grep -qw "DEFAULT_DECOMPRESS=" ${CWDIR}${EXTCONF} >/dev/null 2>&1; then
-		sysrc -f ${CWDIR}${EXTCONF} ZFS_DECOMPRESS="${DEF_ZFS_DECOMPRESS}" >/dev/null 2>&1
-	fi
+	fi	
 }
 
 bastille_initial_download()
diff --git a/conf/bastille.conf.ext b/conf/bastille.conf.ext
index 88c4805..c4130d9 100644
--- a/conf/bastille.conf.ext
+++ b/conf/bastille.conf.ext
@@ -8,11 +8,15 @@ bastille_sharedir="/usr/local/share/bastille"
 bastille_bootstrap_archives="base"
 bastille_tzdata="etc/UTC"
 bastille_resolv_conf="/etc/resolv.conf"
+bastille_url_freebsd="http://ftp.freebsd.org/pub/FreeBSD/releases/"
+bastille_url_hardenedbsd="http://installer.hardenedbsd.org/pub/hardenedbsd/"
 bastille_zfs_enable=""
 bastille_zfs_zpool=""
 bastille_zfs_prefix="bastille"
 bastille_zfs_mountpoint="${bastille_prefix}"
 bastille_zfs_options="-o compress=lz4 -o atime=off"
+bastille_compress_xz_options="-0 -v"
+bastille_decompress_xz_options="-c -d -v"
 bastille_jail_loopback=""
 bastille_jail_interface=""
 bastille_jail_external=""
diff --git a/version b/version
index 28dff43..2e9116b 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.0.35
+1.0.36