Juan David Hurtado G
0d5b92c052
Improve bastille.conf handling with user prompt for creation
...
Replaced ineffective default configuration generation logic with a user-interactive prompt. Users can now choose to create the configuration file with default values if it is missing, ensuring better control and clarity. Removed redundant code from the setup script to streamline execution.
2024-12-29 15:22:17 -05:00
Juan David Hurtado G
383f968685
Revert "Merge pull request #770 from tschettervictor/patch-7"
...
This reverts commit 649c3370557d3ca7b21b
2024-12-29 10:29:03 -05:00
tschettervictor
b736d770cb
Merge branch 'BastilleBSD:master' into patch-7
2024-12-27 12:09:45 -07:00
Barry McCormick
7d3ca7b21b
Merge pull request #769 from tschettervictor/patch-6
...
Fix pfctl being invoked when NAT is not used + change ip var to ip4
2024-12-27 11:04:11 -08: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
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
caba006cac
Merge branch 'BastilleBSD:master' into patch-6
2024-12-16 23:02:58 -07:00
tschettervictor
e5985ccfc4
Merge branch 'BastilleBSD:master' into patch-7
2024-12-16 23:02:34 -07:00
tschettervictor
05d645e972
Merge branch 'BastilleBSD:master' into master
2024-12-16 23:02:03 -07:00
Barry McCormick
4c58fd984e
Merge pull request #768 from tschettervictor/patch-5
...
Fix error produced by pfctl when no rules are returned
2024-12-16 18:58:32 -08:00
tschettervictor
b12719372c
typo
2024-12-16 09:50:01 -07:00
tschettervictor
7304aa67cc
Merge branch 'BastilleBSD:master' into patch-7
2024-12-16 07:25:52 -07:00
tschettervictor
f79cc609d3
Merge branch 'BastilleBSD:master' into patch-5
2024-12-16 07:25:37 -07:00
tschettervictor
176e36d00e
Merge branch 'BastilleBSD:master' into master
2024-12-16 07:24:28 -07:00
tschettervictor
47a6ee5323
Merge branch 'master' into patch-6
2024-12-16 07:22:53 -07:00
tschettervictor
f91f24695b
fix for new shell check
2024-12-16 07:02:09 -07:00
Barry McCormick
fb21ff1be3
Merge pull request #752 from michael-o/issues/688
...
"bastille boostrap" gives spurious and wrong warning about "bastille_…
2024-12-15 22:58:22 -08:00
Juan David Hurtado G
889308465f
shellcheck: mount. Style: indication of line continuation
2024-12-15 21:06:59 -05:00
Juan David Hurtado G
78d2ae9b2c
shellcheck: fix create intentional '@' and disable SC2140
2024-12-15 11:02:28 -05:00
Juan David Hurtado G
124e968b65
shellcheck: fix zfs intentional '@' and disable SC2140
2024-12-15 10:59:30 -05:00
Juan David Hurtado G
a906f14ce8
shellcheck: fix double quote on update TEMPLATES
2024-12-15 10:51:30 -05:00
Juan David Hurtado G
63964b107d
shellcheck: disable=SC3003 on verify.sh
2024-12-15 09:58:05 -05:00
Juan David Hurtado G
fd175fddca
shellcheck: disable=SC2046 on verify.sh pt2
2024-12-15 09:57:30 -05:00
Juan David Hurtado G
763184ad52
shellcheck: disable=SC2046 on verify.sh
2024-12-15 09:43:24 -05:00
tschettervictor
86e7d58358
Allow using template in custom directory
2024-12-10 16:48:17 -07:00
tschettervictor
108227f72e
remove padding
2024-12-10 15:07:29 -07:00
tschettervictor
2a8a070251
remove "which pfctl"
...
We assume that if the jail has an ip4.addr value, then pfctl is obviously installed.
It is also not invoked by start, so stop should not need it either.
2024-12-10 15:04:27 -07:00
tschettervictor
42a5a38334
fix start.sh also
2024-12-10 14:59:02 -07:00
tschettervictor
aa17f5c4f9
Fix pfctl being invoked when NAT is not used + change ip var to ip4 for future ip6 implementation
2024-12-10 14:51:29 -07:00
Juan David Hurtado G
7bad37c250
shellcheck: export, mount. Logic syntax
2024-12-10 14:14:07 -05:00
tschettervictor
b16d21b018
Fix error produced by pfctl when no rules are returned
2024-12-09 20:06:28 -07:00
Juan David Hurtado G
097ad8e269
shellcheck: template, revert single quotes
2024-12-09 19:43:04 -05:00
Juan David Hurtado G
d708a3460d
shellcheck: template, fix quotes
2024-12-09 07:53:56 -05: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
b6bf75a4ef
[WIP] shellcheck linting
2024-12-08 21:05:45 -05:00
Juan David Hurtado G
8808e8a5a4
[WIP] shellcheck linting
2024-12-08 20:57:43 -05:00
Juan David Hurtado G
7e6a9fa896
[WIP] shellcheck linting
2024-12-08 20:37:02 -05:00
tschettervictor
a42d1223c7
Merge branch 'BastilleBSD:master' into master
2024-12-08 13:21:58 -07:00
Juan David Hurtado G
85d656bd11
setup: shellcheck
2024-12-08 15:12:15 -05:00
Juan David Hurtado G
55bc30e071
Merge branch 'master' into shellcheck
2024-12-08 15:08:20 -05:00
Barry McCormick
370efb2093
Merge pull request #751 from tschettervictor/patch-3
...
Update usage.rst - bastille list only shows running containers
2024-12-07 19:27:56 -08:00
tschettervictor
6a3d675e5f
Update clone.sh - final commit for static mac cleanup
2024-12-06 12:18:17 -07:00
tschettervictor
e055c87d0f
Update common.sh - clean up static mac code
2024-12-06 11:42:50 -07:00
tschettervictor
203af6c8ad
Update common.sh - move generation of static mac to main functions
2024-12-06 11:39:10 -07:00
