Commit Graph

1273 Commits

Author SHA1 Message Date
tschettervictor
d9ef63bc60 clone: update "update_jail_conf_vnet" function for optional static MAC 2025-01-13 16:03:30 -07:00
tschettervictor
c9bb5132c0 common: do not trim : from MAC too early 2025-01-13 15:58:56 -07:00
tschettervictor
5345c2a599 common: MAC now follows host prefix, and hashes jail+hostMAC for suffix 2025-01-13 13:59:55 -07:00
tschettervictor
131c89c6f8 clone: Static MAC optional 2025-01-13 13:25:54 -07:00
tschettervictor
cd8461691f common: Static MAC optional 2025-01-13 13:23:08 -07:00
tschettervictor
10822931bb create: Static MAC optional 2025-01-13 13:19:26 -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
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
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
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
2c4ff17c6b Merge pull request #782 from BastilleBSD/setup-config-file
Improve bastille.conf handling with user prompt for creation
2024-12-29 15:25:46 -05: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