From 1c219693c157b85ff578e393c8fd3d80ec992546 Mon Sep 17 00:00:00 2001 From: Jose Date: Sun, 8 Mar 2020 18:19:40 -0400 Subject: [PATCH] Cleanup, remove obsolete file --- CHANGELOG | 1 + conf/bastille.conf.sample | 37 ------------------------------------- version | 2 +- 3 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 conf/bastille.conf.sample diff --git a/CHANGELOG b/CHANGELOG index 12a26a1..41663ad 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ ====================== Version Description +1.0.40......Cleanup, remove obsolete file 1.0.39......Update config, remove unused variable. 1.0.38......Always pre-configure bastille.conf on new installs. 1.0.37......Add initial support for IPv6 and VNET. diff --git a/conf/bastille.conf.sample b/conf/bastille.conf.sample deleted file mode 100644 index 2bef663..0000000 --- a/conf/bastille.conf.sample +++ /dev/null @@ -1,37 +0,0 @@ -##################### -## [ BastilleBSD ] ## -##################### - -## default paths -bastille_prefix="/usr/local/bastille" ## default: "/usr/local/bastille" -bastille_cachedir="${bastille_prefix}/cache" ## default: ${bastille_prefix}/cache -bastille_jailsdir="${bastille_prefix}/jails" ## default: ${bastille_prefix}/jails -bastille_logsdir="${bastille_prefix}/logs" ## default: ${bastille_prefix}/logs -bastille_releasesdir="${bastille_prefix}/releases" ## default: ${bastille_prefix}/releases -bastille_templatesdir="${bastille_prefix}/templates" ## default: ${bastille_prefix}/templates - -## bastille scripts directory (assumed by bastille pkg) -bastille_sharedir="/usr/local/share/bastille" ## default: "/usr/local/share/bastille" - -## bootstrap archives (base, lib32, ports, src, test) -bastille_bootstrap_archives="base" ## default: "base" - -## default timezone -bastille_tzdata="etc/UTC" ## default: "etc/UTC" - -## default jail resolv.conf -bastille_resolv_conf="/etc/resolv.conf" ## default: "/etc/resolv.conf" - -## ZFS options -bastille_zfs_enable="" ## default: "" -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/version b/version index 672e5f5..42de374 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.0.39 +1.0.40