diff --git a/usr/local/bin/bastille b/usr/local/bin/bastille index d3d2d47..991c30c 100755 --- a/usr/local/bin/bastille +++ b/usr/local/bin/bastille @@ -69,7 +69,7 @@ bastille_perms_check . /usr/local/etc/bastille/bastille.conf ## version -BASTILLE_VERSION="0.4.20190714" +BASTILLE_VERSION="0.4.20191025" usage() { cat << EOF diff --git a/usr/local/etc/bastille/bastille.conf b/usr/local/etc/bastille/bastille.conf index 7524c23..556dcfc 100644 --- a/usr/local/etc/bastille/bastille.conf +++ b/usr/local/etc/bastille/bastille.conf @@ -28,3 +28,10 @@ bastille_zfs_zpool="" ## default: "" bastille_zfs_prefix="bastille" ## default: "${bastille_zfs_zpool}/bastille" bastille_zfs_mountpoint=${bastille_prefix} ## default: "${bastille_prefix}" bastille_zfs_options="-o compress=lz4 -o atime=off" ## default: "-o compress=lz4 -o atime=off" + +## Networking +bastille_jail_loopback="lo1" ## default: "lo1" +bastille_jail_interface="bastille0" ## default: "bastille0" +bastille_jail_external="" ## default: "" +bastille_jail_addr="10.17.89.10" ## default: "10.17.89.10" +bastille_jail_gateway="" ## default: "" diff --git a/usr/local/share/bastille/bootstrap.sh b/usr/local/share/bastille/bootstrap.sh index 45a75bd..d2e64fe 100644 --- a/usr/local/share/bastille/bootstrap.sh +++ b/usr/local/share/bastille/bootstrap.sh @@ -362,24 +362,42 @@ HW_MACHINE_ARCH=$(sysctl hw.machine_arch | awk '{ print $2 }') # Filter sane release names case "${1}" in -11.3-RELEASE) - RELEASE="${1}" - UPSTREAM_URL="http://ftp.freebsd.org/pub/FreeBSD/releases/${HW_MACHINE}/${HW_MACHINE_ARCH}/11.3-RELEASE" - bootstrap_directories - bootstrap_release - ;; 11.2-RELEASE) RELEASE="${1}" UPSTREAM_URL="http://ftp.freebsd.org/pub/FreeBSD/releases/${HW_MACHINE}/${HW_MACHINE_ARCH}/11.2-RELEASE" bootstrap_directories bootstrap_release ;; +11.3-RELEASE) + RELEASE="${1}" + UPSTREAM_URL="http://ftp.freebsd.org/pub/FreeBSD/releases/${HW_MACHINE}/${HW_MACHINE_ARCH}/11.3-RELEASE" + bootstrap_directories + bootstrap_release + ;; 12.0-RELEASE) RELEASE="${1}" UPSTREAM_URL="http://ftp.freebsd.org/pub/FreeBSD/releases/${HW_MACHINE}/${HW_MACHINE_ARCH}/12.0-RELEASE" bootstrap_directories bootstrap_release ;; +12.1-RC1) + RELEASE="${1}" + UPSTREAM_URL="http://ftp.freebsd.org/pub/FreeBSD/releases/${HW_MACHINE}/${HW_MACHINE_ARCH}/12.1-RC1" + bootstrap_directories + bootstrap_release + ;; +12.1-RC2) + RELEASE="${1}" + UPSTREAM_URL="http://ftp.freebsd.org/pub/FreeBSD/releases/${HW_MACHINE}/${HW_MACHINE_ARCH}/12.1-RC2" + bootstrap_directories + bootstrap_release + ;; +12.1-RELEASE) + RELEASE="${1}" + UPSTREAM_URL="http://ftp.freebsd.org/pub/FreeBSD/releases/${HW_MACHINE}/${HW_MACHINE_ARCH}/12.1-RELEASE" + bootstrap_directories + bootstrap_release + ;; 11-stable-LAST) RELEASE="${1}" UPSTREAM_URL="https://installer.hardenedbsd.org/pub/HardenedBSD/releases/${HW_MACHINE}/${HW_MACHINE_ARCH}/hardenedbsd-11-stable-LAST"