From eadb217f57d44cb266b6e183df7c3a350f0b707c Mon Sep 17 00:00:00 2001 From: tschettervictor Date: Thu, 25 Dec 2025 21:45:12 -0700 Subject: [PATCH 1/2] update to version 1.3.2 --- docs/chapters/installation.rst | 2 +- docs/conf.py | 4 ++-- usr/local/bin/bastille | 2 +- usr/local/etc/rc.d/bastille-monitor | 30 +++++++++++++++++++++++++++++ 4 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 usr/local/etc/rc.d/bastille-monitor diff --git a/docs/chapters/installation.rst b/docs/chapters/installation.rst index b50d634f..81ea0d35 100644 --- a/docs/chapters/installation.rst +++ b/docs/chapters/installation.rst @@ -5,7 +5,7 @@ Bastille is available in the official FreeBSD ports tree at ``sysutils/bastille``. Binary packages are available in quarterly and latest repositories. -Current version is ``1.3.1.251223``. +Current version is ``1.3.2.251225``. To install from the FreeBSD package repository: diff --git a/docs/conf.py b/docs/conf.py index a0b3700e..501ee12b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -5,9 +5,9 @@ copyright = '2018-2025, Christer Edwards' author = 'Christer Edwards' # The short X.Y version -version = '1.3.1' +version = '1.3.2' # The full version, including alpha/beta/rc tags -release = '1.3.1.251223' +release = '1.3.2.251225' # -- General configuration --------------------------------------------------- diff --git a/usr/local/bin/bastille b/usr/local/bin/bastille index 194929ee..81b6d8b6 100755 --- a/usr/local/bin/bastille +++ b/usr/local/bin/bastille @@ -32,7 +32,7 @@ PATH=${PATH}:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin -BASTILLE_VERSION=1.3.1.251223 +BASTILLE_VERSION=1.3.2.251225 # Validate config file # Copy default when 'setup' is called diff --git a/usr/local/etc/rc.d/bastille-monitor b/usr/local/etc/rc.d/bastille-monitor new file mode 100644 index 00000000..e13f8069 --- /dev/null +++ b/usr/local/etc/rc.d/bastille-monitor @@ -0,0 +1,30 @@ +#!/bin/sh + +# Bastille Monitor +# +# PROVIDE: bastille_monitor +# REQUIRE: jail +# KEYWORD: shutdown + +# Add the following to /etc/rc.conf[.local] to enable this service +# +# bastille_monitor_enable (bool): Set to "NO" by default. +# Set to "YES" to enable. +# bastille_monitor_rate (bool): Rate at which to run the monitor. +# Set to "10" by default, 5 minutes. +# + +. /etc/rc.subr + +name=bastille_monitor +rcvar=${name}_enable + +: ${bastille_monitor_enable:="NO"} +: ${bastille_monitor_rate:="10"} + +pidfile="/var/run/${name}.pid" +command="/usr/sbin/daemon" +command_args="-R ${bastille_monitor_rate} -P ${pidfile} -H -o /var/log/${name}.log /usr/local/bin/bastille monitor ALL" + +load_rc_config ${name} +run_rc_command "$1" From 0e17a1f5f84c8aa42c950f3ea2c1ab13e6b59d69 Mon Sep 17 00:00:00 2001 From: tschettervictor Date: Thu, 25 Dec 2025 21:46:34 -0700 Subject: [PATCH 2/2] remove extra file --- usr/local/etc/rc.d/bastille-monitor | 30 ----------------------------- 1 file changed, 30 deletions(-) delete mode 100644 usr/local/etc/rc.d/bastille-monitor diff --git a/usr/local/etc/rc.d/bastille-monitor b/usr/local/etc/rc.d/bastille-monitor deleted file mode 100644 index e13f8069..00000000 --- a/usr/local/etc/rc.d/bastille-monitor +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# Bastille Monitor -# -# PROVIDE: bastille_monitor -# REQUIRE: jail -# KEYWORD: shutdown - -# Add the following to /etc/rc.conf[.local] to enable this service -# -# bastille_monitor_enable (bool): Set to "NO" by default. -# Set to "YES" to enable. -# bastille_monitor_rate (bool): Rate at which to run the monitor. -# Set to "10" by default, 5 minutes. -# - -. /etc/rc.subr - -name=bastille_monitor -rcvar=${name}_enable - -: ${bastille_monitor_enable:="NO"} -: ${bastille_monitor_rate:="10"} - -pidfile="/var/run/${name}.pid" -command="/usr/sbin/daemon" -command_args="-R ${bastille_monitor_rate} -P ${pidfile} -H -o /var/log/${name}.log /usr/local/bin/bastille monitor ALL" - -load_rc_config ${name} -run_rc_command "$1"