Commit Graph

820 Commits

Author SHA1 Message Date
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
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
tschettervictor
a3d96003b8 mount: change " -gt 6" > "-gt 7" 2025-01-10 10:22:31 -07: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
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
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
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
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
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
tschettervictor
d3fd055b67 more random mac 2024-12-30 12:16:26 -07:00
tschettervictor
31ccecb2c0 Merge branch 'BastilleBSD:master' into patch-2 2024-12-29 17:44:21 -07:00
Juan David Hurtado G
0d5b92c052 Improve bastille.conf handling with user prompt for creation
Replaced ineffective default configuration generation logic with a user-interactive prompt. Users can now choose to create the configuration file with default values if it is missing, ensuring better control and clarity. Removed redundant code from the setup script to streamline execution.
2024-12-29 15:22:17 -05:00
tschettervictor
cfadb2537e bugfix for cloneing new mac 2024-12-29 11:43:35 -07:00
Juan David Hurtado G
383f968685 Revert "Merge pull request #770 from tschettervictor/patch-7"
This reverts commit 649c337055, reversing
changes made to 7d3ca7b21b.
2024-12-29 10:29:03 -05:00
tschettervictor
08f5a9a755 fix for multiple spacing 2024-12-27 13:34:14 -07:00
tschettervictor
67185a5a42 fix for multiple spacing in directiry 2024-12-27 13:33:26 -07:00
tschettervictor
3dce542d6b add check_target_exists to common.sh 2024-12-27 12:15:26 -07:00
tschettervictor
5f8c79d277 allow mounting directories with spaces 2024-12-27 12:14:04 -07:00
tschettervictor
30aa0c1408 better error handling 2024-12-27 12:13:38 -07:00
tschettervictor
86fa464957 Merge branch 'BastilleBSD:master' into mount-fixes 2024-12-27 12:11:48 -07:00
tschettervictor
5393e27751 Merge branch 'BastilleBSD:master' into fix-cmd-template 2024-12-27 12:10:05 -07:00
tschettervictor
3c04a88947 Merge branch 'BastilleBSD:master' into check_jail_exists-function 2024-12-27 12:09:55 -07:00
tschettervictor
b736d770cb Merge branch 'BastilleBSD:master' into patch-7 2024-12-27 12:09:45 -07:00
tschettervictor
3dbeab291c Merge branch 'BastilleBSD:master' into patch-1 2024-12-27 12:09:07 -07:00
Barry McCormick
7d3ca7b21b Merge pull request #769 from tschettervictor/patch-6
Fix pfctl being invoked when NAT is not used + change ip var to ip4
2024-12-27 11:04:11 -08:00
Barry McCormick
5837a256da Merge pull request #691 from vrachnis/patch-1
Fix alignment when listing jails with more than one IP address
2024-12-27 09:37:56 -08:00
tschettervictor
2bd06807ce Merge branch 'master' into check_jail_exists-function 2024-12-27 08:25:58 -07:00
tschettervictor
9b354c1a2f minor tweak 2024-12-27 08:18:33 -07:00
tschettervictor
82a8d5479b minor tweak 2024-12-27 08:17:49 -07:00
tschettervictor
db0f5c5e09 minor tweak 2024-12-27 08:16:38 -07:00
tschettervictor
a6e4902d26 Merge changes from previous PR 2024-12-26 08:40:27 -07:00
tschettervictor
0dd2fae1c1 bugfix for hashed name ending with b 2024-12-25 21:35:14 -07:00
tschettervictor
54bf9d6d53 move help into options block 2024-12-24 07:40:02 -07:00
tschettervictor
d293db2c54 move help into options block 2024-12-24 07:39:26 -07:00
tschettervictor
c8a4d74fb6 shellcheck disable 2104 2024-12-23 18:28:55 -07:00