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
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
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
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
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
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
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
Martin Stoyanov
4859b56050
fix for https://github.com/BastilleBSD/bastille/issues/661
2024-03-13 10:24:54 -05: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
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
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
622c926917
support lowercase values in bastille.conf (issue #368 )
2023-11-25 15:09:11 -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
8906e491d0
initial support & docs to bootstrap EOL releases
2023-11-20 16:07:11 -07:00
Christer Edwards
ace7bdce2f
add osrelease to jail.conf for new jails
2023-11-19 14:37:31 -07:00
Romain Tartière
157125c4af
Relax validation of -BETA / -RC releases
...
Accross the code, release names are checked against some variation of
-BETAx / -RCx which are inconsistent in the range of accepted values for
`x`.
As a consequence, some commands cannot be successfuly run while they
are valid, e.g. `bastille create test 14.0-RC4 10.0.0.2` is rejected
because only `*-RC1` and `*-RC2` are accepted as a RC release name.
Find out these lists of specific BETA and RC patterns and adjust them to
allow any one-digit value at the end. We generaly do up to 4 BETA / RC
releases, so a one digit limit is probably enough for the time being.
2023-11-10 08:09:51 -10:00
Barry McCormick
df00a7939e
Merge pull request #623 from adriel-tech/patch-1
...
fix configure_zfs() to properly return status of zfs module.
2023-11-01 08:38:17 -07:00
Michal Procházka
cf928f1237
Fix generated interface name in rc.conf for vnet jail
2023-10-30 20:39:58 +01:00
adriel-tech
11367238ec
Update setup.sh
...
Removed -q from kldstat in function configure_zfs().
on FreeBSD 14 (maybe earlier) this causes kldstat to return in such
a way that BastilleBSD assumes zfs is not loaded.
2023-10-29 15:16:39 -07:00
Nikos Chondros
445b42ed39
Merge branch 'master' into master
2023-10-26 20:51:15 +03:00
tucoinfo
e7eb9b7717
fix-issue-601
...
#601
2023-10-19 15:16:37 +02:00
Barry McCormick
721a5ca6a0
fix for JID instead of jail name in list printout
2023-10-18 18:26:55 -07:00
Barry McCormick
91f479e5d7
Merge pull request #598 from JRGTH/import_enhancements
...
Validate jib during jail import
2023-10-18 08:55:10 -07:00
Barry McCormick
f35de69b28
Merge pull request #605 from JRGTH/rdr_fixes
...
Add rdr pf conf check
2023-10-18 08:53:47 -07:00
Barry McCormick
e078aed54a
Merge pull request #608 from tub5ta/patch-1
...
Permit jail upgrades to use BETA and RC branches
2023-10-18 08:53:26 -07:00
Christer Edwards
40e4b817d8
prep & cleanup for 0.10.20231013 release
2023-10-10 19:51:10 -06:00
Barry McCormick
3355c07dbf
rdr disable directive fix
2023-10-04 10:13:08 -07:00
Jason Tubnor
aa688f7072
Update upgrade.sh
...
Allow the uplift of jails to test BETA and RC branches before release
2023-09-20 09:44:28 +10:00
