tschettervictor
0a1e9df948
Update clone.sh - revert jail config edit
...
This reverts some changes the the "update_jailconf" function.
The reason behind this revert is that if a jail somehow has the same name as a directory, then the previous commit would have changed the directory name as well, which would break stuff.
The current code avoids all that and only replaces the necessary jail name value.
2024-12-04 08:18:03 -07:00
tschettervictor
dd0d805dad
Merge branch 'BastilleBSD:master' into master
2024-11-20 18:32:56 -07:00
Juan David Hurtado G
1236191eca
Merge pull request #728 from subnetspider/bastille-version
...
Update BASTILLE_VERSION string
2024-11-17 19:19:27 -05:00
tschettervictor
8a6002d591
Merge branch 'BastilleBSD:master' into master
2024-11-10 15:31:30 -07:00
subnetspider
d3bac06de3
Update BASTILLE_VERSION string
...
Update the version string in usr/local/bin/bastille from 0.10.20231125 to 0.11.20241022 so that the version reported by "bastille -v" matches the version reported by "pkg info bastille | grep Version".
2024-11-05 07:34:01 +01:00
Christer Edwards
beccb6ff20
Merge pull request #726 from yaazkal/gitignore
...
.gitignore update
2024-10-31 15:16:25 -04:00
yaazkal
d1d30e880b
.gitignore update
2024-10-30 16:45:46 -05:00
tschettervictor
55203b2298
add support for static MAC on VNET jails
...
- support static MAC on bridged and VNET jails
- remove quotes around vnet.interface
2024-10-09 11:31:54 -06:00
tschettervictor
ca66263ee2
support cloning of bridged VNET jails + static MAC jails
...
- fixed cloning of VNET bridged jails
- added support for regenerating static MAC on cloned jails
- simplified some sed commands to edit cloned jail.conf file
Tested with bridged VNET, VNET, and loopback jails
2024-10-09 11:30:09 -06:00
tschettervictor
5fab649266
Add see command to rename bridges interface
2024-10-09 09:15:52 -06:00
tschettervictor
ee21616e81
Uncomment for non-VNET jails
2024-10-09 09:05:49 -06:00
tschettervictor
a9c1bae0ca
beginning work to allow cloned jail with new static MAC feature
...
Current implementation allows for cloning jails that were created using a static MAC.
Also removed some unnecessary sed strings. These were simplified.
2024-10-09 08:47:46 -06:00
tschettervictor
cc75f454b4
spacing edit
2024-10-08 16:35:01 -06:00
tschettervictor
2560b43602
support for -V option also
2024-10-08 16:32:52 -06:00
tschettervictor
0961165d36
add support for static mac address for jails
...
This commit will generate a static MAC address for each jail, based on the name of the jail. It will use the first half (xx:xx:xx) of the host MAC to avoid network clashes, and generate a random HEX string from the hashed name of the jail. It will then add that random 5 character HEX string in MAC format, and add an "a" and "b" for the host and jail respectively.
This way a jail can retain it's MAC ID even if it is deleted and reinstalled, as long as the same name is retained.
2024-10-08 16:21:28 -06:00
Juan David Hurtado G
cee6f20aa5
Merge pull request #711 from yaazkal/fix-conf-zpool
...
[FIX] correctly use bastille_zfs_prefix to also work on pools != zroot
2024-07-14 23:14:33 -05:00
yaazkal
1a27a7e0d4
[FIX] correctly use bastille_zfs_prefix to also work on pools different than zroot see PR #685
2024-07-14 18:32:32 -05:00
Juan David Hurtado G
c7f46c3fbb
Merge pull request #710 from yaazkal/fix-cp-rcp
...
[FIX] cp and rcp commands not handling the quiet option correctly
2024-07-14 15:46:29 -05:00
yaazkal
bfe413e8ec
[FIX] cp and rcp commands not handling the quiet option correctly
2024-07-14 15:45:03 -05:00
Juan David Hurtado G
9aeb0ea10c
Merge pull request #643 from draga79/master
...
Adjust devfs_ruleset for hierarchical jails compatibility
2024-07-14 09:00:54 -05:00
Juan David Hurtado G
9f2cf6651b
Merge pull request #686 from deadbeef2000/master
...
[FIX] Fixed rcorder startup
2024-07-13 21:05:59 -05:00
Juan David Hurtado G
cb5697acdd
Merge pull request #709 from yaazkal/bastille-day-24
...
Review for PR#650
2024-07-13 17:32:19 -05:00
yaazkal
09dcdd0ec7
[REF] clean code for PR#650
2024-07-13 17:29:30 -05:00
Juan David Hurtado G
b7b2efca12
Merge pull request #650 from em-winterschon/fbsd-140R-setup-bootstrap-fixes
...
diff patches applied to resolve errors on setup.sh and bootstrap.sh
2024-07-13 17:20:23 -05:00
Juan David Hurtado G
e441850f81
Merge pull request #665 from andrewhotlab/master
...
restore check_fib() call
2024-07-13 08:01:20 -05:00
Juan David Hurtado G
87febb6407
Merge pull request #689 from Vertalo/work/bugfix_zfs_export
...
Fix to correctly check ZFS on/off closes #661
2024-07-08 20:26:27 -05:00
Juan David Hurtado G
3fff3d371d
Merge pull request #649 from tedhen/master
...
Fix one letter spelling mistake.
2024-07-08 08:32:34 -05:00
Stefano Marinelli
7750a1b927
Merge pull request #1 from BastilleBSD/master
...
Sync from original repo
2024-06-30 14:52:43 +02:00
Juan David Hurtado G
ee96a206aa
Merge pull request #705 from yaazkal/fix-rc-depends
...
[FIX] bastille rc script to require jail closes #698
2024-06-14 12:14:34 -05:00
yaazkal
6568a28c15
[FIX] bastille rc script to require jail closes #698
2024-06-05 22:33:38 -05:00
Martin Stoyanov
4859b56050
fix for https://github.com/BastilleBSD/bastille/issues/661
2024-03-13 10:24:54 -05:00
Christopher Kepes
1d14badc4a
Fixed rcorder startup (added -a to basename)
2024-02-29 11:40:55 +01:00
Andrew
5faac5e7a4
restore check_fib() calls
...
This is needed to respect the "exec.fib" parameter in bastille "console" command, which has been deleted by commit b997be5
2024-01-18 19:55:58 +01:00
Eva Winterschön
19c8c021c4
diff patches applied to resolve errors on setup.sh and bootstrap.sh
2023-12-25 11:39:02 -08:00
Ted Henriksson
9d55c2ceb0
Fix one letter spelling mistake.
2023-12-25 18:36:02 +01:00
Stefano Marinelli
6ca8ea578e
Adjust devfs_ruleset for hierarchical jails compatibility
...
Hierarchical jails inherit the parent jail's permissions and don't support setting devfs_ruleset to a non-zero value. This update adds a check to determine if the script is running inside a jail. If so, it sets devfs_ruleset to 0 to comply with this constraint.
2023-11-27 18:45:09 +01:00
Christer Edwards
3a4ebc63bb
Merge pull request #642 from BastilleBSD/support_lowercase
...
fix logic for rc.conf + bastille.conf ZFS check
2023-11-25 19:15:16 -07:00
Christer Edwards
c627b1f7fa
fix logic for rc.conf + bastille.conf ZFS check
2023-11-25 19:11:57 -07:00
Christer Edwards
bce28bf89a
Merge pull request #641 from BastilleBSD/setup_vnet
...
add support for bastille_vnet devfs.rules in bastille setup
2023-11-25 17:21:49 -07:00
Christer Edwards
dd60e7f175
add support for bastille_vnet devfs.rules in bastille setup
2023-11-25 17:19:57 -07:00
Christer Edwards
32d67aea40
Merge pull request #640 from BastilleBSD/eol_patch
...
fix for recent EOL support patch
2023-11-25 17:07:56 -07:00
Christer Edwards
b30a7484bb
fix for recent EOL support patch
2023-11-25 17:06:05 -07:00
Christer Edwards
86cb374732
Merge pull request #639 from BastilleBSD/support_lowercase
...
support upper & lowercase values in bastille.conf
2023-11-25 16:16:47 -07:00
Christer Edwards
622c926917
support lowercase values in bastille.conf (issue #368 )
2023-11-25 15:09:11 -07:00
Christer Edwards
b05493bc8e
Merge pull request #638 from BastilleBSD/create_matrix
...
support combining options for bastille create
2023-11-24 16:42:40 -07:00
Christer Edwards
97a0e692d9
standardize options in create matrix
2023-11-24 16:41:25 -07:00
Christer Edwards
3df39078bf
support combining options for bastille create
2023-11-24 16:28:31 -07:00
Christer Edwards
620ad465d6
Merge pull request #637 from BastilleBSD/20231125_prep
...
update documentation for 14.0-RELEASE
2023-11-24 16:04:21 -07:00
Christer Edwards
d44c85637e
update documentation for 14.0-RELEASE
2023-11-24 15:20:15 -07:00
Christer Edwards
c2b17f346d
Merge pull request #635 from BastilleBSD/readthedocs
...
fix more readthedocs build info
2023-11-21 13:22:44 -07:00
