Merge pull request #745 from BastilleBSD/rel/0.12

release: 0.12.20241124

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Makefile

@@ -1,4 +1,4 @@
-BASTILLE_VERSION=$$(git rev-parse HEAD)
+BASTILLE_VERSION=$$(git rev-parse --short HEAD)
 
 .PHONY: all
 all:

docs/chapters/installation.rst

@@ -4,7 +4,7 @@ Bastille is available in the official FreeBSD ports tree at
 `sysutils/bastille`. Binary packages available in `quarterly` and `latest`
 repositories.
 
-Current version is `0.10.20231125`.
+Current version is `0.12.20241124`.
 
 To install from the FreeBSD package repository:
 

docs/conf.py

@@ -8,13 +8,13 @@
 # -- Project information -----------------------------------------------------
 
 project = 'Bastille'
-copyright = '2018-2023, Christer Edwards'
+copyright = '2018-2024, Christer Edwards'
 author = 'Christer Edwards'
 
 # The short X.Y version
-version = '0.10.20231125'
+version = '0.12.20241124'
 # The full version, including alpha/beta/rc tags
-release = '0.10.20231125-beta'
+release = '0.12.20241124-beta'
 
 
 # -- General configuration ---------------------------------------------------

usr/local/bin/bastille

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -62,7 +62,7 @@ bastille_perms_check() {
 bastille_perms_check
 
 ## version
-BASTILLE_VERSION="0.11.20241022"
+BASTILLE_VERSION="0.12.20241124"
 
 usage() {
     cat << EOF
@@ -185,6 +185,7 @@ clone|config|cmd|console|convert|cp|edit|htop|limits|mount|pkg|rcp|rename|servic
         elif [ "${CMD}" = 'template' ] && [ "${TARGET}" = '--convert' ]; then
             # This command does not act on a jail, so we are temporarily bypassing the presence/started
             # checks. The command will simply convert a template from hooks to a Bastillefile. -- cwells
+            :
         else
             JAILS="${TARGET}"
 
@@ -215,6 +216,7 @@ clone|config|cmd|console|convert|cp|edit|htop|limits|mount|pkg|rcp|rename|servic
     ;;
 esac
 
+# shellcheck disable=SC2154
 SCRIPTPATH="${bastille_sharedir}/${CMD}.sh"
 if [ -f "${SCRIPTPATH}" ]; then
     : "${UMASK:=022}"

usr/local/share/bastille/bootstrap.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/clone.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/cmd.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/common.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/config.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/console.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/convert.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/cp.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/create.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/destroy.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/edit.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/export.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/htop.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/import.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/limits.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 # Ressource limits added by Sven R github.com/hackacad
 #

usr/local/share/bastille/list.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/mount.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/pkg.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/rcp.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2022, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/rdr.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/rename.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/restart.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/service.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -31,6 +31,8 @@
 bastille_config="/usr/local/etc/bastille/bastille.conf"
 . /usr/local/share/bastille/common.sh
 
+# TODO: This not going to take effect since Bastille checks the file
+# before running this subcommand. We will need to check an strategy.
 if [ ! -f "${bastille_config}" ]; then
   cp /usr/local/etc/bastille/bastille.conf.sample ${bastille_config}
 fi
@@ -108,6 +110,7 @@ antispoof for \$ext_if inet
 pass in inet proto tcp from any to any port ssh flags S/SA keep state
 EOF
     sysrc pf_enable=YES
+    warn "pf ruleset created, please review ${bastille_pf_conf} and enable it using 'service pf start'."
 else
     error_exit "${bastille_pf_conf} already exists. Exiting."
 fi

usr/local/share/bastille/start.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/stop.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/sysrc.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/tags.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 # Ressource limits added by Lars Engels github.com/bsdlme
 #

usr/local/share/bastille/template.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/top.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/umount.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/update.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/upgrade.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/verify.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

usr/local/share/bastille/zfs.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018-2023, Christer Edwards <[email protected]>
+# Copyright (c) 2018-2024, Christer Edwards <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without