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
Barry McCormick
c9bb127cf3
Merge pull request #755 from tschettervictor/patch-4
...
Update setup.sh - fail setup on multiple zpool detection
2024-12-07 19:15:29 -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
tschettervictor
0030213ff3
Update README.md
2024-12-04 10:27:07 -07:00
tschettervictor
904c05f7fb
Update bastille - list command only shows running
2024-12-04 10:26:32 -07:00
tschettervictor
9a157f2fc8
Update clone.sh - remove duplicate line
2024-12-04 08:18:53 -07:00
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
052c8b7492
Update setup.sh - uppercase ZFS
2024-12-04 07:22:42 -07:00
tschettervictor
4e460abcde
Update setup.sh - add additional warning to enable ZFS when adding ZPOOL
2024-12-03 18:32:54 -07:00
tschettervictor
53bd72a272
Update setup.sh - fail setup on multiple zpool detection
2024-12-03 18:26:49 -07:00
Michael Osipov
d0f890890f
"bastille boostrap" gives spurious and wrong warning about "bastille_zfs_enable" ( #688 )
...
Simply set to "NO" to satisfy setter function.
This fixes #688
2024-11-29 16:17:54 +01:00
tschettervictor
8c872c708b
Update usage.rst - bastille list only shows running containers
...
'bastille list' will only print running containers.
'-a' or 'all' is needed to print both running and stopped.
2024-11-25 10:37:41 -07:00
Juan David Hurtado G
11b75f5dad
shellcheck errors: SC2068 Double quote array expansions to avoid re-splitting elements.
2024-11-24 20:49:06 -05:00
Juan David Hurtado G
c8a2b3a784
Merge pull request #745 from BastilleBSD/rel/0.12
...
release: 0.12.20241124
2024-11-24 17:21:56 -05:00
Juan David Hurtado G
426d0fde34
setup: comment with TODO for bastille.conf check
2024-11-24 16:58:04 -05:00
Juan David Hurtado G
67234b2d84
bastille: shellcheck
2024-11-24 16:42:26 -05:00
Juan David Hurtado G
9157ac34e3
bastille: adding a no operation command
2024-11-24 16:20:13 -05:00
Juan David Hurtado G
3f0a460f90
setup: warning about reviewing and starting pf
2024-11-24 15:16:09 -05:00
Juan David Hurtado G
72a4706175
Merge branch 'master' into rel/0.12
2024-11-24 11:08:39 -05:00
Juan David Hurtado G
20276f5484
Merge pull request #746 from BastilleBSD/setup-cleaning
...
setup: warning deprecation of bastille0 option and updates documentation
2024-11-24 11:08:09 -05:00
Juan David Hurtado G
cee4d669ca
setup: warning deprecation of bastille0 option and updates documentation
2024-11-24 11:07:46 -05:00
Juan David Hurtado G
624a5c92ca
Merge pull request #742 from msoudny/master
...
changed setup.sh loopback creation
2024-11-24 10:58:51 -05:00
Juan David Hurtado G
7dbe1e761b
rel: update copyright year and release version
2024-11-24 09:46:09 -05:00
Juan David Hurtado G
901ccad0ea
make: uses --short for the git commit when using make install for testing
2024-11-24 09:15:20 -05:00
Juan David Hurtado G
8b6c537480
Merge pull request #744 from BastilleBSD/722-export-xz
...
export: be clear that --xz is for ZFS systems
2024-11-24 08:31:28 -05:00
Juan David Hurtado G
b91d357679
export: be clear that --xz is for ZFS systems
...
The support for the `--xz` option is only for ZFS at the moment since the `import` command assumes that was the case. By now just show a more descriptive message if `--xz` was used on a UFS system.
2024-11-24 08:29:22 -05:00
msoudny
4753006e2c
Update setup.sh
...
- check that bastille.conf exists or create a copy from .sample,
- changed "bastille0" loopback creation to read config value $bastille_network_loopback instead,
- changed setup.sh argument "bastille0" for loopback interface creation to a more generic "network",
- "bastille0" as a setup.sh argument is left for backwards compatibility
2024-11-24 09:47:57 +01:00
Juan David Hurtado G
26a8f30948
Merge pull request #741 from tschettervictor/patch-2
...
One more doc change to clarify zfs mount location
2024-11-23 21:18:28 -05:00
tschettervictor
41b43f90c6
One more doc change to clarify zfs mount location
2024-11-23 19:08:50 -07:00
Juan David Hurtado G
086cdab7e2
Merge pull request #740 from BastilleBSD/setup-zfs-issue
...
setup: shellchek
2024-11-23 20:34:56 -05:00
Juan David Hurtado G
dac683356f
Merge pull request #739 from tschettervictor/patch-1
...
Add docs about 'bastille_zfs_prefix'
2024-11-23 20:33:29 -05:00
Yaazkal
1d11cf2daf
setup: shellchek
2024-11-23 20:20:14 -05:00
tschettervictor
2fae787d78
Add docs about 'bastille_zfs_prefix'
2024-11-23 18:13:49 -07:00
Juan David Hurtado G
12457b2b06
Merge pull request #738 from msoudny/msoudny-patch-1-1
...
Revert bastille_zfs_prefix: Msoudny patch 1 1
2024-11-23 18:04:11 -05:00
msoudny
435af03e09
Merge branch 'BastilleBSD:master' into msoudny-patch-1-1
2024-11-23 20:46:01 +01: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
msoudny
6ef1a7c208
Update bastille.conf.sample
...
removed $bastille_zfs_zpool from bastille zfs_prefix as it's called as $bastille_zfs_zpool/$bastille_zfs_prefix in bootstrap.sh, clone.sh, create.sh, destroy.sh, export.sh, import.sh, rename.sh, zfs.sh and causes duplicate zpool name which leads to errors.
2024-11-05 09:50:24 +01: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
