tschettervictor
176e36d00e
Merge branch 'BastilleBSD:master' into master
2024-12-16 07:24:28 -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
Juan David Hurtado G
7bad37c250
shellcheck: export, mount. Logic syntax
2024-12-10 14:14:07 -05: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
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
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
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
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
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
Yaazkal
1d11cf2daf
setup: shellchek
2024-11-23 20:20:14 -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
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
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
