Commit Graph

112 Commits

Author SHA1 Message Date
Barry McCormick
ed9ba44035 Merge pull request #919 from BastilleBSD/list-jail-name
list: Do not list Path and Hostname + list Name
2025-04-23 08:49:42 -07:00
tschettervictor
1cc713ec86 list: Only list the relevant template part of the directory 2025-04-21 17:30:16 -06:00
tschettervictor
3572164e5b list: Support old "all" style as well as short style 2025-04-20 21:08:36 -06:00
tschettervictor
3df35bdae1 list: Spacing fix 2025-04-20 18:43:23 -06:00
tschettervictor
dcce58c6d0 list: Retain support for all 2025-04-14 21:31:30 -06:00
tschettervictor
d6db4adc2f Update list.sh 2025-04-14 21:29:54 -06:00
tschettervictor
bddc7dd1cb list: Reverst targeting all jails 2025-04-14 21:22:37 -06:00
tschettervictor
ba1157b732 list: Use priority for list all 2025-04-14 21:05:03 -06:00
tschettervictor
df356fc881 Merge branch 'master' into list-jail-name 2025-04-14 20:55:38 -06:00
tschettervictor
9fe20252d4 list: typo s > sed 2025-04-14 20:52:59 -06:00
tschettervictor
0ea6e1966d list: Properly list jail ip if subnet is included 2025-04-14 20:50:00 -06:00
tschettervictor
12f7cf2027 list: Properly list jail ip on stopped thin jail 2025-04-14 20:34:17 -06:00
tschettervictor
0235148989 list: Fix listing jail IP with / subnet 2025-04-14 20:27:36 -06:00
tschettervictor
c57613f9ea list: Retain support if someone specifies -a or all to list all 2025-04-10 16:33:21 -06:00
tschettervictor
01ce1b5e78 list: List all without having to specify -a or all 2025-04-10 16:30:57 -06:00
tschettervictor
d625486847 list: Fix JSON listing 2025-04-03 16:27:18 -06:00
tschettervictor
8ec3003fe2 list: Do not list Path and Hostname + list Name
#914 

This will now list Name after JID, and will not list Path or Hostname.

I've left the relevant code included in case we want to list it in the future.
2025-04-03 16:23:09 -06:00
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