tschettervictor
f766f26c62
common: move export to after for loop
2025-01-05 20:15:01 -07:00
tschettervictor
53295ba69c
quick oopsy fix for exporting TARGET
2025-01-05 20:10:37 -07:00
tschettervictor
61788cce6b
fix shellcheck
2025-01-05 19:51:03 -07:00
tschettervictor
5017ad0120
console: new update
...
This makes console act with the new common.sh file.
Enable debug mode
Allow console by JID
Allow jail autocomplete
2025-01-05 19:21:29 -07:00
tschettervictor
dbd303fa2e
common.sh: integrate new functions
...
These are all the new function I am beginning to move to common.sh for use with all jails.
2025-01-05 19:14:15 -07:00
tschettervictor
bb7f73e8f6
bastille: rename functions to "old" in place of new ones
...
Rename "check_target_is_running" and "target_all_jails" to have the suffix "_old".
These two function are only ever called from within the main bastille executable.
I am integrating these functions in "common.sh" so renaming them here for removal in the future is the best path forward.
2025-01-05 19:10:59 -07:00
tschettervictor
a58da2cda6
Merge branch 'BastilleBSD:master' into patch-2
2025-01-04 10:57:02 -07: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
tschettervictor
43992f3469
template: awk remove spaces from multiple blank lines
...
Awk appears to remove multiple adjacent spaces from lines within a template. Adding "-F '[ ]'" makes sure field splitting is done on every space, thus preserving them.
#400
2025-01-03 07:23:46 -07:00
Barry McCormick
0d32733eed
Merge pull request #761 from tschettervictor/fix-cmd-template
...
Update template.sh - bugfix for cmd
2024-12-31 19:04:29 -08:00
tschettervictor
fedc7aa60c
Remove message on return 1
2024-12-31 15:27:45 -07:00
tschettervictor
4bc76d5064
fix brace
2024-12-31 15:00:12 -07:00
tschettervictor
7a621b2e1a
Merge branch 'master' into check_jail_exists-function
2024-12-31 14:58:50 -07:00
Barry McCormick
4365082bed
Merge pull request #778 from tschettervictor/mount-fixes
...
Mount/Umount fixes and improvements
2024-12-31 13:44:50 -08:00
tschettervictor
9d7b727432
minor fix
2024-12-31 12:27:32 -07:00
tschettervictor
3c60a4b26b
hash mac of host for prefix
2024-12-30 16:49:34 -07:00
tschettervictor
d3fd055b67
more random mac
2024-12-30 12:16:26 -07:00
tschettervictor
31ccecb2c0
Merge branch 'BastilleBSD:master' into patch-2
2024-12-29 17:44:21 -07:00
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
tschettervictor
cfadb2537e
bugfix for cloneing new mac
2024-12-29 11:43:35 -07: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
08f5a9a755
fix for multiple spacing
2024-12-27 13:34:14 -07:00
tschettervictor
67185a5a42
fix for multiple spacing in directiry
2024-12-27 13:33:26 -07:00
tschettervictor
3dce542d6b
add check_target_exists to common.sh
2024-12-27 12:15:26 -07:00
tschettervictor
5f8c79d277
allow mounting directories with spaces
2024-12-27 12:14:04 -07:00
tschettervictor
30aa0c1408
better error handling
2024-12-27 12:13:38 -07:00
tschettervictor
86fa464957
Merge branch 'BastilleBSD:master' into mount-fixes
2024-12-27 12:11:48 -07:00
tschettervictor
5393e27751
Merge branch 'BastilleBSD:master' into fix-cmd-template
2024-12-27 12:10:05 -07:00
tschettervictor
3c04a88947
Merge branch 'BastilleBSD:master' into check_jail_exists-function
2024-12-27 12:09:55 -07: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
2bd06807ce
Merge branch 'master' into check_jail_exists-function
2024-12-27 08:25:58 -07:00
tschettervictor
9b354c1a2f
minor tweak
2024-12-27 08:18:33 -07:00
tschettervictor
82a8d5479b
minor tweak
2024-12-27 08:17:49 -07:00
tschettervictor
db0f5c5e09
minor tweak
2024-12-27 08:16:38 -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
54bf9d6d53
move help into options block
2024-12-24 07:40:02 -07:00
tschettervictor
d293db2c54
move help into options block
2024-12-24 07:39:26 -07:00
tschettervictor
c8a4d74fb6
shellcheck disable 2104
2024-12-23 18:28:55 -07:00
tschettervictor
a5de4a93ff
move mount and umount to no actions commands
2024-12-23 18:25:11 -07:00
tschettervictor
9d254357d0
bugfixes and code cleanup
2024-12-23 18:23:56 -07:00
tschettervictor
341db36103
set_target and error_continue functions
2024-12-23 18:23:31 -07:00
tschettervictor
d2dc83d320
bugfixes and code cleanup
2024-12-23 18:21:09 -07:00
tschettervictor
0413a94896
spacing
2024-12-21 21:45:27 -07:00
tschettervictor
5913fcc689
Update top.sh
2024-12-20 22:41:18 -07:00
tschettervictor
4a93f61c2a
Update htop.sh
2024-12-20 22:41:00 -07:00
tschettervictor
d458ed8ee1
Update common.sh
2024-12-20 22:39:53 -07:00
