Commit Graph

1824 Commits

Author SHA1 Message Date
tschettervictor
79304cd75e docs: Configuration - hyphen 2025-03-07 06:04:49 -07:00
tschettervictor
49a4bed126 Merge branch 'BastilleBSD:master' into custom-config 2025-03-03 16:26:54 -07:00
tschettervictor
3fd1b01831 docs: Add config to usage page 2025-03-03 16:24:41 -07:00
tschettervictor
7d5955fd8c docs: Add config option to readme 2025-03-03 16:24:02 -07:00
tschettervictor
ba79a545cc Merge pull request #900 from BastilleBSD/template-hostcmd
template: Add HOSTCMD to hooks

You can now use HOSTCMD as a template hook, and the exact command will be run on the host as-is.
2025-03-03 16:09:15 -07:00
tschettervictor
bafda4db1e docs: Document HOSTCMD 2025-03-03 16:07:57 -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
c2dcbe70ad Merge pull request #899 from BastilleBSD/vnet-vlan
create: Allow setting VLAN for VNET jails
2025-03-03 14:41:49 -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
fa187baf8c docs: Fix wording on configuration 2025-03-03 08:19:01 -07:00
tschettervictor
fdd42adcb5 Merge pull request #898 from BastilleBSD/tschettervictor-patch-1
stop: Do not attempt any pf actions if it has not been configured
2025-03-02 17:47:59 -07: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
b273540e05 docs: Add configuration to index tree 2025-03-02 16:28:57 -07:00
tschettervictor
d489ffad67 docs: Add configuration and document custom config 2025-03-02 16:28:11 -07:00
tschettervictor
1c184840ea docs: Spacing fix 2025-03-02 16:10:46 -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
fdf5086c34 Merge pull request #897 from BastilleBSD/tschettervictor-patch-1
bastille: Missed jcp in main command
2025-03-02 05:55:03 -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
b614efd3ac Merge pull request #894 from BastilleBSD/getting-started-docs 2025-03-01 14:35:43 -07:00
tschettervictor
870a8aff16 Update export.rst 2025-03-01 13:53:38 -07:00
tschettervictor
07106c5889 docs: Clarify what the host does in different network scenarios 2025-03-01 13:47:15 -07:00
tschettervictor
c605d8c711 Update template.rst 2025-03-01 13:26:20 -07:00
tschettervictor
b4f75a47db Update networking.rst 2025-03-01 13:24:46 -07:00
tschettervictor
b08286bfa1 Update zfs.rst 2025-03-01 13:19:46 -07:00
tschettervictor
935e4424ec Update verify.rst 2025-03-01 13:19:31 -07:00
tschettervictor
de636d3e57 Update upgrade.rst 2025-03-01 13:19:16 -07:00
tschettervictor
91d6c668a9 Update update.rst 2025-03-01 13:19:03 -07:00
tschettervictor
310346caa0 Update umount.rst 2025-03-01 13:18:52 -07:00