Commit Graph

88 Commits

Author SHA1 Message Date
tschettervictor
d1156cbb05 common: typo and trailing whitespace 2025-03-02 13:19:26 -07:00
tschettervictor
454288b2b1 bastille: Load config only from commons.sh
Since all files source common.sh anyway, we don't want to source the config twice.
2025-03-02 11:23:35 -07:00
tschettervictor
b5611e9196 common: Load config as variable 2025-03-01 20:03:03 -07:00
tschettervictor
b09ee86037 Fix shellcheck 2025-03-01 18:51:17 -07:00
tschettervictor
6ba11dc762 bastille: Support user based config
This PR will allow bastille to be configured based on the user you run as.

To load the config for a specifig user, you must be logged in as the specified user, and there must be a file called "bastille_user.conf" inside /usr/local/etc/bastille or else bastille will just load the default config file.
2025-03-01 18:48:14 -07:00
tschettervictor
2e55965edd Merge branch 'master' into common.sh_functions 2025-01-26 10:38:58 -07:00
tschettervictor
2f594e4e65 common: Also check ifconfig for epairs 2025-01-25 10:22:23 -07:00
tschettervictor
2c45c51e84 common: Add notes about how MAC is generated 2025-01-24 07:33:19 -07:00
tschettervictor
b3ff3efed9 common: Add comment about MAC address 2025-01-24 06:49:19 -07:00
tschettervictor
603da3ca8d common: Adjust fstab function 2025-01-21 06:54:06 -07:00
tschettervictor
abdf885c3a common: Comment about MAC prefix 2025-01-18 17:47:13 -07:00
tschettervictor
589f19032a common: Allow name=if for bridge 2025-01-18 16:32:40 -07:00
tschettervictor
fdff42a1b3 common: fix epair naming 2025-01-18 10:08:02 -07:00
Barry McCormick
fb876b4074 Merge pull request #808 from tschettervictor/patch-3
create: Static MAC optional
2025-01-15 21:29:48 -08:00
tschettervictor
edc6f29184 common: final revision of changes 2025-01-15 14:33:22 -07:00
Barry McCormick
49a7a643a8 Merge pull request #790 from tschettervictor/etcupdate
etcupdate: beta version
2025-01-14 21:37:54 -08:00
tschettervictor
9420441a56 common: Add comments about static MAC 2025-01-14 10:54:28 -07:00
tschettervictor
b1a3306cef common: use FreeBSD prefix for static MAC 2025-01-14 07:33:43 -07:00
tschettervictor
57a652cc70 common: update function to use "epairx" because of name limit in FreeBSD 2025-01-13 17:44: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
cd8461691f common: Static MAC optional 2025-01-13 13:23:08 -07: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
f55335e21c common: fix [] 2025-01-09 23:31:23 -07:00
tschettervictor
d1e475e3d1 common: fix brackets [] 2025-01-09 23:30:48 -07:00
tschettervictor
fb145b3441 common: error when jail name is a number 2025-01-09 20:47:39 -07:00
tschettervictor
e6e60a3a32 common: update set_target_single 2025-01-09 15:12:23 -07:00
tschettervictor
18826666d7 common: support single target function error when multi-target selected 2025-01-08 12:59:55 -07:00
tschettervictor
e3a57e21ea common: simplify debug message 2025-01-07 15:42:44 -07:00
tschettervictor
5d3f4732fb common: grep quietly for "check_target_is*" functions 2025-01-06 12:45:44 -07:00
tschettervictor
a9bd2d55c1 common.sh: revert VNET function 2025-01-06 12:41:30 -07:00
tschettervictor
873a5230c4 common: 0>1 for base interface grep 2025-01-06 08:57:00 -07:00
tschettervictor
02396f569f vnet: start VNET jails at 1 because bastille0 is used as a loopback 2025-01-05 21:55:28 -07:00
tschettervictor
f766f26c62 common: move export to after for loop 2025-01-05 20:15:01 -07:00
tschettervictor
53295ba69c quick oopsy fix for exporting TARGET 2025-01-05 20:10:37 -07:00
tschettervictor
61788cce6b fix shellcheck 2025-01-05 19:51:03 -07:00
tschettervictor
dbd303fa2e common.sh: integrate new functions
These are all the new function I am beginning to move to common.sh for use with all jails.
2025-01-05 19:14:15 -07:00
tschettervictor
a58da2cda6 Merge branch 'BastilleBSD:master' into patch-2 2025-01-04 10:57:02 -07: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
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
3dce542d6b add check_target_exists to common.sh 2024-12-27 12:15:26 -07:00
tschettervictor
86fa464957 Merge branch 'BastilleBSD:master' into mount-fixes 2024-12-27 12:11:48 -07:00
tschettervictor
2bd06807ce Merge branch 'master' into check_jail_exists-function 2024-12-27 08:25:58 -07:00
tschettervictor
db0f5c5e09 minor tweak 2024-12-27 08:16:38 -07:00
tschettervictor
c8a4d74fb6 shellcheck disable 2104 2024-12-23 18:28:55 -07:00
tschettervictor
341db36103 set_target and error_continue functions 2024-12-23 18:23:31 -07:00
tschettervictor
d458ed8ee1 Update common.sh 2024-12-20 22:39:53 -07:00