Commit Graph

115 Commits

Author SHA1 Message Date
tschettervictor
e7355e1793 typo 2025-05-20 17:14:18 -06:00
tschettervictor
add84d9a60 template: Allow use of \ as line separator 2025-05-20 17:09:31 -06:00
tschettervictor
b040474bf5 basic spacing fixes for help commands 2025-05-18 17:16:17 -06:00
tschettervictor
76cda4b53f fix & for subshell 2025-05-04 12:35:12 -06:00
tschettervictor
39ed1aaec6 Initial commit for subshell parallel mode 2025-05-04 12:11:16 -06:00
tschettervictor
68f4aecddf finish refactor of line spacing 2025-05-01 17:39:50 -06:00
tschettervictor
824ffb2980 Add \n to info _jail 2025-04-30 18:49:14 -06:00
tschettervictor
2b5f239050 final run through 2025-04-30 13:39:05 -06:00
tschettervictor
bef2ece965 adjust blank line option 2025-04-30 08:19:50 -06:00
tschettervictor
b73639d8b6 rework blank lines again 2025-04-29 21:58:15 -06:00
tschettervictor
046cf87e79 rework blank line 2025-04-29 21:51:24 -06:00
tschettervictor
310258f4b4 set _LAST_JAIL in common 2025-04-29 21:08:08 -06:00
tschettervictor
7974eb7429 only set _last_jail once 2025-04-29 20:53:27 -06:00
tschettervictor
feaf8c792b print blank line after last jail 2025-04-29 20:48:11 -06:00
tschettervictor
f423446370 add blank line after each jail on multiple targets 2025-04-29 18:54:34 -06:00
tschettervictor
11d87a71e2 template: Add comments about warning when ARG not set 2025-04-24 11:05:43 -06:00
tschettervictor
2eda46ee76 template: Only warn on ARG not set 2025-04-24 10:45:26 -06:00
tschettervictor
c16f48db0e template: Don’t show usage on ARG/no value supplied 2025-04-23 21:39:31 -06:00
tschettervictor
34fa107fcf template: Fix lininfile hook 2025-04-04 16:55:33 -06:00
tschettervictor
0df4d71807 template: Fix path when using line in file 2025-04-03 00:06:03 -06:00
tschettervictor
2b1d468040 template: Add LINE_IN_FILE as HOOK
#694
2025-04-02 23:48:32 -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
f1e3de3acc template: Usage command when args < 2 2025-03-06 18:27:41 -07:00
tschettervictor
a2e7f3e426 Revert "template: Add HOSTCMD to hooks" 2025-03-06 18:20:58 -07:00
tschettervictor
49a4bed126 Merge branch 'BastilleBSD:master' into custom-config 2025-03-03 16:26:54 -07:00
tschettervictor
cb5d58e48c template: Continue after HOSTCMD 2025-03-03 16:01:20 -07:00
tschettervictor
6ef1b2d4e0 template: Add HOSTCMD to hooks 2025-03-03 15:57:29 -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
c0e2749dbc template: Fix disabled>disable 2025-02-23 12:36:25 -07:00
tschettervictor
be663cf3b3 template: Implement new functions 2025-02-23 12:24:16 -07:00
tschettervictor
87e9affe46 template: Print only the first IP for the jail 2025-02-23 09:24:15 -07:00
tschettervictor
d799fa37b6 template: Fix shellcheck 2025-02-22 23:47:07 -07:00
tschettervictor
efa279bf71 template: Support old style IP/interface pair 2025-02-22 23:45:24 -07:00
tschettervictor
c2421ad981 template: Code cleanup for getting IP 2025-02-22 23:43:16 -07:00
tschettervictor
1ef0de52a0 template: One more fix for IP 2025-02-22 23:35:49 -07:00
tschettervictor
f06788ee7b Update template.sh 2025-02-22 23:24:17 -07:00
tschettervictor
f0063b41f7 template: FIx booboo 2025-02-22 23:15:49 -07:00
tschettervictor
2ed27f572e template: Fix booboo 2025-02-22 22:54:46 -07:00
tschettervictor
4b092e513a template: jail_ip > jail_ip4 2025-02-22 22:52:55 -07:00
tschettervictor
8f6599fd49 template: Trim trailing slash from jail ip 2025-02-22 22:51:23 -07:00
tschettervictor
6193fa307a template: Use new style of interface|ip pair 2025-02-22 22:49:33 -07:00
tschettervictor
813a6ccd26 template: Remove quotes from args 2025-02-13 06:56:24 -07:00
tschettervictor
4dc2b3b842 template: Fix default value with spaces
#692 
@michael-o 

This essentially just makes sure there are not multiple quotes following each other inside the ARG value.
2025-02-10 12:07:12 -07:00
tschettervictor
4d554e19cd template: Treat ampersand literally 2025-02-03 17:54:34 -07:00
tschettervictor
a5f66c6e80 template: do not escape & in “cmd” 2025-01-14 09:13:52 -07:00
tschettervictor
358dbe7e0b template: allow & in arg string 2025-01-14 08:45:35 -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
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
tschettervictor
6a3fbf2aeb Revert "Update template.sh - bugfix for cmd" 2025-01-04 10:31:11 -07:00