Commit Graph

78 Commits

Author SHA1 Message Date
tschettervictor
9091fa3880 Update clone.sh 2025-04-16 20:01:15 -06:00
tschettervictor
8c20d534d7 clone: Use epair list to find next epair number 2025-04-16 19:11:09 -06:00
tschettervictor
dd2a56af6d epair: Use full list 2025-04-16 17:22:51 -06:00
tschettervictor
353a63eef8 fix clone and network numbering epair 2025-04-16 17:04:51 -06:00
tschettervictor
c2b756219c Force config file in default location
This will prevent errors when bastille gathers the number of epairs on the system.
2025-04-16 16:08:17 -06:00
tschettervictor
d5deb9bd1b Fix epair numbering when mixing -V and -B jails on one systme 2025-04-16 12:07:15 -06:00
Barry McCormick
ee62485178 Merge pull request #895 from tschettervictor/custom-config
bastille: Support user based config
2025-03-26 22:24:41 -07:00
Barry McCormick
f935cba9f3 Merge pull request #783 from tschettervictor/multiple-interfaces
network: Support adding/removing multiple interfaces in jails
2025-03-26 22:21:29 -07:00
tschettervictor
0f3b5baf83 clone: Fix old to new interface style 2025-03-21 05:43:04 -06:00
tschettervictor
47faf79f3a clone: Fix old style interface to new style 2025-03-20 17:31:26 -06:00
tschettervictor
2ef9f95477 clone: Allow to clone with VLANs 2025-03-03 14:58:51 -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
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
de79af7bb4 clone: Fix for same jail description 2025-02-05 13:51:50 -08:00
tschettervictor
6301d637fb clone: Fix missing command 2025-02-05 10:57:44 -08:00
tschettervictor
7250522b1e clone: Rebase 2025-02-05 08:12:20 -08:00
tschettervictor
d9af67b3d3 clone: Fix IP6 mode 2025-02-03 13:01:36 -07:00
tschettervictor
ef6d7616ba clone: Remove unneeded vars 2025-02-03 12:51:52 -07:00
tschettervictor
b76201e25c clone: Fix cloning with “if|ip” jail entry 2025-02-03 12:45:55 -07:00
tschettervictor
b1d6b49141 clone: Typo in usage block 2025-01-26 11:11:00 -07:00
tschettervictor
1a77041e8e clone: Also check ifconfig for epairs 2025-01-25 10:24:33 -07:00
tschettervictor
10c82964e3 clone: Change MAC after IF 2025-01-19 08:27:41 -07:00
tschettervictor
c1537e2a20 clone: Spacing -1 2025-01-19 08:22:12 -07:00
tschettervictor
1fc84bc168 clone: Fix retrieving ext if MAC on bridge 2025-01-19 08:14:24 -07:00
tschettervictor
ef8a4e209f clone: more typos 2025-01-18 22:14:13 -07:00
tschettervictor
73b9b14931 clone: typos 2025-01-18 22:10:23 -07:00
tschettervictor
04f86c3f5b clone: Allow name=if clone 2025-01-18 16:38:29 -07:00
tschettervictor
e36d1c2881 clone: fix mac not applying on bridge 2025-01-13 17:19:03 -07:00
tschettervictor
d9ef63bc60 clone: update "update_jail_conf_vnet" function for optional static MAC 2025-01-13 16:03:30 -07:00
tschettervictor
131c89c6f8 clone: Static MAC optional 2025-01-13 13:25:54 -07:00
tschettervictor
bf750f2b18 Merge branch 'BastilleBSD:master' into multiple-interfaces 2025-01-11 16:02:11 -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
c46b033da1 Update clone.sh 2024-12-30 16:56:24 -07:00
tschettervictor
85c12f368b keep better track of interfaces 2024-12-30 12:18:11 -07:00
tschettervictor
a73da1d442 small bugfix 2024-12-29 18:16:43 -07:00
tschettervictor
9f75d11744 clone support multiple interface cloning 2024-12-29 17:47:12 -07:00
tschettervictor
cfadb2537e bugfix for cloneing new mac 2024-12-29 11:43:35 -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
76983fa48c spacing 2024-12-20 08:53:56 -07:00
tschettervictor
6b4a897f62 Spacing 2024-12-20 08:51:46 -07:00
tschettervictor
54e886f682 missing sed command to add new description 2024-12-20 07:23:06 -07:00
tschettervictor
3f0a43046e Update clone.sh 2024-12-19 18:45:55 -07:00
tschettervictor
b12719372c typo 2024-12-16 09:50:01 -07:00
tschettervictor
176e36d00e Merge branch 'BastilleBSD:master' into master 2024-12-16 07:24:28 -07:00
Juan David Hurtado G
8808e8a5a4 [WIP] shellcheck linting 2024-12-08 20:57:43 -05:00
tschettervictor
a42d1223c7 Merge branch 'BastilleBSD:master' into master 2024-12-08 13:21:58 -07:00
tschettervictor
6a3d675e5f Update clone.sh - final commit for static mac cleanup 2024-12-06 12:18:17 -07:00
tschettervictor
9a157f2fc8 Update clone.sh - remove duplicate line 2024-12-04 08:18:53 -07:00
tschettervictor
0a1e9df948 Update clone.sh - revert jail config edit
This reverts some changes the the "update_jailconf" function.

The reason behind this revert is that if a jail somehow has the same name as a directory, then the previous commit would have changed the directory name as well, which would break stuff.

The current code avoids all that and only replaces the necessary jail name value.
2024-12-04 08:18:03 -07:00