Commit Graph

1247 Commits

Author SHA1 Message Date
tschettervictor
2d51d5bb11 Merge branch 'BastilleBSD:master' into multiple-interfaces 2025-03-10 17:28:55 -06:00
tschettervictor
2db0801e62 network: Copyright year 2024 > 2025 2025-03-10 17:28:24 -06:00
tschettervictor
f3fae040db network: Force > auto typo 2025-03-10 17:26:35 -06:00
tschettervictor
ebb290e4fb network: Do not allow a 4th arg on --no-ip 2025-03-10 17:22:04 -06:00
tschettervictor
bd88d7fcc6 network: Add --no-ip swithc for vnet 2025-03-10 16:59:48 -06:00
tschettervictor
f1e3de3acc template: Usage command when args < 2 2025-03-06 18:27:41 -07:00
tschettervictor
a2e7f3e426 Revert "template: Add HOSTCMD to hooks" 2025-03-06 18:20:58 -07:00
tschettervictor
75f02d5f8d Update network.sh 2025-03-06 16:54:58 -07:00
tschettervictor
21edede663 network: Exit on VLAN added 2025-03-06 16:42:21 -07:00
tschettervictor
2e38c6d940 Update network.sh 2025-03-06 16:39:15 -07:00
tschettervictor
0341789c44 Update network.sh 2025-03-06 16:37:41 -07:00
tschettervictor
0ec64bc238 Update network.sh 2025-03-06 16:30:28 -07:00
tschettervictor
b8d9eae21f Update network.sh 2025-03-06 16:28:45 -07:00
tschettervictor
50ebdd5118 network: Quick bugfix 2025-03-06 16:27:37 -07:00
tschettervictor
e578ec1b22 network: Fix spacing 2025-03-06 16:24:07 -07:00
tschettervictor
c0307f09c5 network: Cosmetic fixes 2025-03-06 16:18:13 -07:00
tschettervictor
88133464b9 network: Fix VLAN adding 2025-03-06 16:12:55 -07:00
tschettervictor
8301fac183 Update network.sh 2025-03-06 12:56:19 -07:00
tschettervictor
bc03a2c147 network: Add vlan in separate block 2025-03-06 12:54:09 -07:00
tschettervictor
d92c61ee6f Allow multiple VLANS on single jail vnet 2025-03-06 12:40:16 -07:00
tschettervictor
dede7f4b4a Use default value for VLAN template 2025-03-06 12:39:35 -07:00
tschettervictor
c7b845f29b network: Allow adding VLAN when IF already added 2025-03-06 12:37:46 -07:00
tschettervictor
3fc16e5118 network: -z for VLAN + VNET 2025-03-04 11:44:41 -07:00
tschettervictor
4793f1cf88 network: Add check for VLAN already added 2025-03-04 11:32:51 -07:00
tschettervictor
d7e12d698e Merge branch 'BastilleBSD:master' into multiple-interfaces 2025-03-03 16:27:02 -07:00
tschettervictor
cb5d58e48c template: Continue after HOSTCMD 2025-03-03 16:01:20 -07:00
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
644bb8633a bastille: Missed jcp in main command 2025-03-02 05:54:26 -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