Commit Graph

1341 Commits

Author SHA1 Message Date
tschettervictor
cab6ef8c06 Merge branch 'BastilleBSD:master' into rdr-multiple-interfaces 2025-01-11 16:04:03 -07:00
Juan David Hurtado G
1dedfed3a0 Merge pull request #803 from BastilleBSD/rel/0.12.20250111
Release 0.12.20250111
2025-01-11 17:18:26 -05:00
Juan David Hurtado G
7e90b7072f Update Bastille version to 0.12.20250111
Updated the version references in documentation, configuration, and script files to reflect the latest release.
2025-01-11 17:16:19 -05:00
Juan David Hurtado G
65aa9d0258 docs: Fix typo in umount command documentation 2025-01-11 16:59:01 -05:00
Juan David Hurtado G
c70cb249dd bastille: Fix typo in prompt message for missing configuration file. 2025-01-11 16:40:31 -05:00
Juan David Hurtado G
c544727d40 bastille: fix sourcing common before the config file check, this ensures setup can run correctly 2025-01-11 15:55:21 -05:00
Juan David Hurtado G
8b0411c111 Add SPDX license identifiers and update copyright years
Added SPDX-License-Identifier to all scripts for better license clarity and compliance. Updated the copyright years from 2024 to 2025 in various files to reflect the current maintenance period.
2025-01-11 14:07:41 -05:00
Juan David Hurtado G
fbb9c8cce3 Merge pull request #801 from tschettervictor/patch-1
mount: document options string to allow comma separated list
2025-01-11 13:51:49 -05:00
tschettervictor
fb08b8bd4d mount: docs, typo 2025-01-11 11:39:19 -07:00
tschettervictor
3436fe8e94 mount: Docs, typo + example mount with options 2025-01-11 11:38:18 -07:00
tschettervictor
21023ca032 mount: docs, update code order 2025-01-11 11:23:50 -07:00
tschettervictor
938e74ae4b mount: document options string to allow comma separated list 2025-01-11 11:13:02 -07:00
Barry McCormick
43dbb3d87f Merge pull request #800 from tschettervictor/patch-1
mount: allow mount with options behind permissions
2025-01-11 08:23:38 -08:00
tschettervictor
fb71f0dda5 mount: allow mount with options behind permissions
Allow mounting with permissions like “rw,other,options” that are needed for tmpfs mounting.
2025-01-10 15:22:31 -07:00
Barry McCormick
22c3455826 Merge pull request #799 from tschettervictor/patch-1
mount: change " -gt 6" > "-gt 7"
2025-01-10 09:32:32 -08:00
tschettervictor
a3d96003b8 mount: change " -gt 6" > "-gt 7" 2025-01-10 10:22:31 -07:00
Barry McCormick
fd476ba515 Merge pull request #798 from tschettervictor/patch-1
list: correctly print JID instead of JAILNAME
2025-01-10 07:48:33 -08:00
tschettervictor
e405302cec list: fix find command not registering "" properly 2025-01-09 23:45:26 -07:00
tschettervictor
983ffa7014 list: correctly print JID instead of JAILNAME 2025-01-09 23:35:31 -07:00
tschettervictor
685c8f9079 doc: rdr with multiple interfaces 2025-01-08 10:31:47 -07:00
tschettervictor
eee99a3b79 rdr: fix _jail > TARGET + alphabetical option order 2025-01-08 10:25:15 -07:00
tschettervictor
2da817e0d4 list: use list command for jail list 2025-01-07 23:16:35 -07:00
tschettervictor
e5f5655828 rdr: Allow only a single target 2025-01-07 23:15:02 -07:00
tschettervictor
b7c861f6f9 rdr: clear > reset notify on duplicate jail rules 2025-01-07 22:58:54 -07:00
tschettervictor
a169beb073 rdr: do not allow rules to be duplicated between jails 2025-01-07 22:55:36 -07:00
tschettervictor
ada6c2d61c rdr: correctly print default interface IP 2025-01-07 17:03:00 -07:00
Barry McCormick
ee644d4969 Merge pull request #793 from bramton/conf2
config: Correctly match valueless parameters. Fixes #693
2025-01-07 11:02:45 -08:00
tschettervictor
6f0d318fd3 rdr: Add debug option, code cleanup 2025-01-06 18:43:22 -07:00
tschettervictor
0501dc59a0 Merge branch 'BastilleBSD:master' into rdr-multiple-interfaces 2025-01-06 17:03:48 -07:00
Juan David Hurtado G
e9cc59d308 Merge pull request #749 from tschettervictor/patch-1
Update destroy.sh - refuse to destroy jail with mounted filesystem
2025-01-06 17:39:06 -05:00
Juan David Hurtado G
f8a7145bec Merge pull request #666 from gahr/adjust-all-mount-points
rename: adjust all mount points
2025-01-06 15:38:42 -05:00
Bram
ba82767cad config: Correctly match valueless parameters. Fixes #693 2025-01-06 12:20:37 +01:00
tschettervictor
84394d7306 Merge branch 'BastilleBSD:master' into patch-1 2025-01-04 18:33:07 -07:00
tschettervictor
33b3c18937 Merge branch 'BastilleBSD:master' into rdr-multiple-interfaces 2025-01-04 18:32:16 -07:00
Juan David Hurtado G
16bc90a64f Merge pull request #781 from tschettervictor/patch-2
common: Fix generate_static_mac()
2025-01-04 19:46:21 -05:00
tschettervictor
a58da2cda6 Merge branch 'BastilleBSD:master' into patch-2 2025-01-04 10:57:02 -07:00
tschettervictor
529848ebeb Merge branch 'BastilleBSD:master' into patch-1 2025-01-04 10:56:53 -07:00
Barry McCormick
f956254157 Merge pull request #787 from tschettervictor/patch-4
template: awk removes spaces from multiple blank lines
2025-01-04 09:36:06 -08:00
Barry McCormick
8cded0e0a5 Merge pull request #789 from tschettervictor/revert-761-fix-cmd-template
Revert "Update template.sh - bugfix for cmd"
2025-01-04 09:32:45 -08:00
tschettervictor
6a3fbf2aeb Revert "Update template.sh - bugfix for cmd" 2025-01-04 10:31:11 -07:00
tschettervictor
43992f3469 template: awk remove spaces from multiple blank lines
Awk appears to remove multiple adjacent spaces from lines within a template. Adding "-F '[ ]'" makes sure field splitting is done on every space, thus preserving them.

#400
2025-01-03 07:23:46 -07:00
Barry McCormick
0d32733eed Merge pull request #761 from tschettervictor/fix-cmd-template
Update template.sh - bugfix for cmd
2024-12-31 19:04:29 -08:00
Barry McCormick
ac39d4a169 Merge pull request #776 from tschettervictor/check_jail_exists-function
begin moving functions to common.sh (top htop)
2024-12-31 14:34:33 -08:00
tschettervictor
fedc7aa60c Remove message on return 1 2024-12-31 15:27:45 -07:00
tschettervictor
4bc76d5064 fix brace 2024-12-31 15:00:12 -07:00
tschettervictor
7a621b2e1a Merge branch 'master' into check_jail_exists-function 2024-12-31 14:58:50 -07:00
Barry McCormick
4365082bed Merge pull request #778 from tschettervictor/mount-fixes
Mount/Umount fixes and improvements
2024-12-31 13:44:50 -08:00
tschettervictor
9d7b727432 minor fix 2024-12-31 12:27:32 -07:00
tschettervictor
ba2ff8ef75 better error handling 2024-12-31 10:33:59 -07:00
tschettervictor
3c60a4b26b hash mac of host for prefix 2024-12-30 16:49:34 -07:00