tschettervictor
6ef1b2d4e0
template: Add HOSTCMD to hooks
2025-03-03 15:57:29 -07:00
tschettervictor
6520be4834
network: Allow VLANs when adding VNET interfaces
2025-03-03 15:09:08 -07:00
tschettervictor
2ef9f95477
clone: Allow to clone with VLANs
2025-03-03 14:58:51 -07:00
tschettervictor
45678ef5bf
Merge branch 'master' into vnet-vlan
2025-03-03 14:40:59 -07:00
tschettervictor
6a4ab32ce5
Merge pull request #888 from BastilleBSD/create-custom-zfs-options
...
create: Allow setting zfs options on creating jail
2025-03-03 14:16:44 -07:00
tschettervictor
07095fc79e
create: ZFS opts not optional
2025-03-03 13:02:00 -07:00
tschettervictor
dc9e225d8e
create: Fix shellcheck
2025-03-03 12:38:13 -07:00
tschettervictor
90ceb69eb0
conf: Add vlan template
2025-03-03 12:34:32 -07:00
tschettervictor
6e7ea625b7
create: Spacing
2025-03-03 12:33:57 -07:00
tschettervictor
64447e2b3c
vlans: Add Bastillefile
2025-03-03 12:32:43 -07:00
tschettervictor
8395e8b000
create: More vlan imporvements
2025-03-03 12:28:23 -07:00
tschettervictor
4c68b748b6
create: Add --vlan option
2025-03-03 12:13:48 -07:00
Barry McCormick
c6297d7194
Merge pull request #887 from BastilleBSD/jail-import-iocage-ezjail
...
import: Import jails using new interface format (iocage,ezjail)
2025-03-03 08:26:25 -08:00
tschettervictor
be6885eb3e
stop: Do not attempt any pf actions if it has not been configured
2025-03-02 17:47:18 -07:00
tschettervictor
e834b84dd6
Update bastille
2025-03-02 13:20:14 -07:00
tschettervictor
d1156cbb05
common: typo and trailing whitespace
2025-03-02 13:19:26 -07:00
tschettervictor
af2bf4b235
bastille: version and help not optional
2025-03-02 12:53:13 -07:00
tschettervictor
454288b2b1
bastille: Load config only from commons.sh
...
Since all files source common.sh anyway, we don't want to source the config twice.
2025-03-02 11:23:35 -07:00
tschettervictor
644bb8633a
bastille: Missed jcp in main command
2025-03-02 05:54:26 -07:00
tschettervictor
4a1fb4bf89
bastille: Exit instead of info
2025-03-01 22:02:01 -07:00
tschettervictor
9c1fa6eb91
bastille: Load config if set in ENV
2025-03-01 22:00:06 -07:00
tschettervictor
58cb2ccdf7
Load config after setting BASTILLE_CONFIG
2025-03-01 21:38:13 -07:00
tschettervictor
3dd3956a88
bastille: Export only if env not set
2025-03-01 21:33:54 -07:00
tschettervictor
efcfe7c2b0
bastille: export BASTILLE_CONFIG
2025-03-01 21:21:18 -07:00
tschettervictor
fab14ffe7c
bastille: Allow setting config file
2025-03-01 21:14:56 -07:00
tschettervictor
b5611e9196
common: Load config as variable
2025-03-01 20:03:03 -07:00
tschettervictor
b09ee86037
Fix shellcheck
2025-03-01 18:51:17 -07:00
tschettervictor
6ba11dc762
bastille: Support user based config
...
This PR will allow bastille to be configured based on the user you run as.
To load the config for a specifig user, you must be logged in as the specified user, and there must be a file called "bastille_user.conf" inside /usr/local/etc/bastille or else bastille will just load the default config file.
2025-03-01 18:48:14 -07:00
tschettervictor
71f0370cf4
create: Allow DHCP as option
2025-03-01 00:15:17 -07:00
tschettervictor
eed70dc129
import: Fix shellcheck
2025-02-28 23:13:57 -07:00
tschettervictor
efee919b49
import: Fix import to release for bastille jails
2025-02-28 23:12:31 -07:00
tschettervictor
b498fca79e
import: Fix import to a release from iocage
2025-02-28 23:10:04 -07:00
tschettervictor
4c251451ba
upgrade: Use config command to get release on thin jails
2025-02-28 22:55:05 -07:00
tschettervictor
9c6067f7a2
upgrade: Make sure thin jails are stopped before upgrading
2025-02-28 22:46:27 -07:00
tschettervictor
0b77f94d2f
upgrade: Check jail is running earlier
2025-02-28 22:36:38 -07:00
tschettervictor
2bd35fc9d2
import: Manual network only if definitions not set
2025-02-28 22:31:13 -07:00
tschettervictor
98eb36b209
create: Missed one var for config option
2025-02-28 17:45:53 -07:00
tschettervictor
22456b0d7c
create: Remove config option
2025-02-28 17:45:10 -07:00
tschettervictor
6fcbdef5eb
bootstrap: Remove config option
2025-02-28 17:44:28 -07:00
tschettervictor
24eefc325f
bootstrap: Allow bootstrapping with custom config
2025-02-28 17:32:45 -07:00
tschettervictor
9e9cef90d4
create: Override shellcheck for sourcing variable
2025-02-28 17:22:46 -07:00
tschettervictor
320bcde2b2
create: Allow specifying a custom config file to override default
2025-02-28 17:15:10 -07:00
tschettervictor
223c538680
create: Fix spacing in help command
2025-02-28 13:05:13 -07:00
tschettervictor
3acd06a0f1
create: Allow setting zfs options on creating jail
...
#514
@s1dh
Run 'bastille create help' to see syntax
2025-02-28 12:59:48 -07:00
tschettervictor
bb228a4f74
export: Break on no options
2025-02-28 12:04:33 -07:00
tschettervictor
b734b926c2
export: Reset options
2025-02-28 12:03:08 -07:00
tschettervictor
1c0ed95e63
export: Fix expr syntax
2025-02-28 11:59:56 -07:00
tschettervictor
34a0582075
export: Add debug mode
2025-02-28 11:57:20 -07:00
tschettervictor
295612da5f
create: Do not check running if empty jail
2025-02-28 11:49:29 -07:00
tschettervictor
7ddff7fa94
export: Restructure code for new functions
2025-02-28 11:25:17 -07:00