Commit Graph

95 Commits

Author SHA1 Message Date
tschettervictor
599c7bf3a7 list: Fix listing JSON when multiple IPs 2025-04-02 13:48:36 -06:00
tschettervictor
37b845d462 list: Fix listing all in json 2025-03-28 14:20:35 -06:00
tschettervictor
47624e44ba list: Dont print subnet on DOWN jail IP 2025-03-27 00:01:08 -06:00
tschettervictor
e3dddd25e7 Merge branch 'master' into priority-add 2025-03-26 23:30:38 -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
tschettervictor
690121ce96 Update list.sh 2025-03-22 09:22:53 -06:00
tschettervictor
660b545f9d list: Fix listing of JID on multiple IPs 2025-03-22 09:09:37 -06:00
tschettervictor
57296e8da2 list: Fix shellcheck 2025-03-21 17:46:25 -06:00
tschettervictor
d0421eaddd list: Properly list vlan IPs 2025-03-21 17:43:20 -06:00
tschettervictor
eaacab6e7e fix listing jail priority 2025-03-19 10:24:50 -06:00
tschettervictor
b843b2c100 priority: Use priority list for all comm 2025-03-17 19:54:34 -06:00
tschettervictor
eae87b9218 list: Print only IP using new IF style for jails 2025-03-13 12:29:59 -06:00
tschettervictor
2c72b89753 Update list.sh 2025-03-13 10:06:37 -06:00
tschettervictor
d8131c371c list: Cosmetic fixes 2025-03-13 10:06:03 -06:00
tschettervictor
e6a226085c list: Include boot and priority 2025-03-13 06:43:14 -06: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
b69f180c59 list: Properly list json 2025-02-27 17:59:52 -07:00
tschettervictor
bbc89e36a5 list: Support json format when listing all jails 2025-02-27 17:52:20 -07:00
tschettervictor
bc1bd45d53 list: Update help 2025-02-27 17:21:58 -07:00
tschettervictor
da4752ebd5 list: Use new functions 2025-02-27 17:04:34 -07:00
Barry McCormick
94a785af90 Merge pull request #765 from tschettervictor/rdr-multiple-interfaces
RDR Improvements: Allow TO/FROM+INTERACE+IP STACK
2025-02-22 20:56:28 -08:00
tschettervictor
53d37cde1a list: No color when searching for jails 2025-02-19 20:24:09 -07:00
tschettervictor
81eb8daa4a Merge branch 'BastilleBSD:master' into rdr-multiple-interfaces 2025-02-03 10:54:59 -07:00
tschettervictor
43dfd98af5 list: typo in shellcheck 2025-01-14 15:02:17 -07:00
tschettervictor
b59f02afa3 list: disable shell check (needed for grep error) 2025-01-14 15:00:13 -07:00
tschettervictor
e07f121bcf List: fix “” for shell check 2025-01-14 14:53:56 -07:00
tschettervictor
a83772dc2b list: Fix “grep: no such file”
This fixes the issue introduced by the 0.12-2025 release.

The problem was the entries were being passed to grep as combined strings because of quotes.

Remove the quotes solves the issue.
2025-01-14 14:49:07 -07:00
tschettervictor
cab6ef8c06 Merge branch 'BastilleBSD:master' into rdr-multiple-interfaces 2025-01-11 16:04:03 -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
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
2da817e0d4 list: use list command for jail list 2025-01-07 23:16:35 -07:00
tschettervictor
33b3c18937 Merge branch 'BastilleBSD:master' into rdr-multiple-interfaces 2025-01-04 18:32:16 -07: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
2669d8126b Merge branch 'master' into rdr-multiple-interfaces 2024-12-16 22:55:14 -07:00
tschettervictor
05e0eb27f4 Merge branch 'master' into rdr-multiple-interfaces 2024-12-16 07:26:39 -07:00
tschettervictor
f91f24695b fix for new shell check 2024-12-16 07:02:09 -07:00
tschettervictor
71b1f8ce1d simply print rdr file when listing ports 2024-12-15 08:55:46 -07:00
tschettervictor
1f899b73a7 add space to list command 2024-12-14 16:30:08 -07:00
tschettervictor
2059560dbd list stack when listing ports 2024-12-14 16:18:41 -07:00
tschettervictor
8bf7342105 remove / to stay consistent 2024-12-13 14:52:01 -07:00
tschettervictor
1fcdfa4e9b add "ports" command to list jails and their published ports 2024-12-13 14:49:36 -07:00
tschettervictor
5b7b848b12 revert listing of IP and interface 2024-12-11 11:37:16 -07:00
tschettervictor
471a91ca24 print IP in addition to interface when listing RDR 2024-12-10 18:46:36 -07:00
tschettervictor
dc9822a013 also list interface when doing "list all" for published ports 2024-12-09 17:01:17 -07:00
Juan David Hurtado G
7c000a07d8 [WIP] shellcheck linting 2024-12-08 21:37:26 -05:00
Juan David Hurtado G
7927385458 [WIP] shellcheck linting 2024-12-08 21:34:36 -05:00
Juan David Hurtado G
7dbe1e761b rel: update copyright year and release version 2024-11-24 09:46:09 -05:00
vrachnis
4634dc6910 Fix alignment when listing jails with more than one IP address
When a VNET jail has more than IP address configured on its primary interface, invoking "bastille list -a" will now display all addresses vertically aligned.
2024-03-16 01:31:52 +00:00