Commit Graph

1155 Commits

Author SHA1 Message Date
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
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
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
dd4b1fb6ba import: Fix var -n > -eq 2025-02-27 22:58:51 -07:00
tschettervictor
b69f180c59 list: Properly list json 2025-02-27 17:59:52 -07:00
tschettervictor
bbc89e36a5 list: Support json format when listing all jails 2025-02-27 17:52:20 -07:00
tschettervictor
8e4f09cf8b Merge pull request #876 from tschettervictor/allow-encrpyted-send
create: Send without -R for encrypted bastilleroot
2025-02-27 17:29:10 -07:00
tschettervictor
bc1bd45d53 list: Update help 2025-02-27 17:21:58 -07:00
tschettervictor
bb89e7f45c pkg: Help message update 2025-02-27 17:14:13 -07:00
tschettervictor
4551d6c806 upgrade: Exit if NEWREASE not found on thin jail upgrade 2025-02-27 17:09:20 -07:00
tschettervictor
da4752ebd5 list: Use new functions 2025-02-27 17:04:34 -07:00
tschettervictor
5b599dc593 import: Fix var names 2025-02-27 17:02:54 -07:00
tschettervictor
c22bd866eb import: Use new functions 2025-02-27 16:54:50 -07:00
tschettervictor
22854addf9 export: Update to use new functions 2025-02-27 16:48:54 -07:00
tschettervictor
4e6b531388 create: Fix shellcheck 2025-02-25 15:40:41 -07:00
tschettervictor
dbd13627a9 create: Send without -R for encrypted bastilleroot 2025-02-25 15:37:44 -07:00
tschettervictor
0ef43f889c rdr: Fix for JAIL_IP wrong format 2025-02-25 06:38:28 -07:00
tschettervictor
c28fd33573 rdr: Fix wrong variable on reset command 2025-02-24 07:06:25 -07:00
tschettervictor
f512225df4 verify: Fix line counting again 2025-02-23 23:48:05 -07:00
tschettervictor
613f19edad verify: Fix line counting 2025-02-23 23:40:07 -07:00
tschettervictor
9a2270ce21 verify: Add debug mode 2025-02-23 23:34:57 -07:00
tschettervictor
026499262d bootstrap: Add debug mode 2025-02-23 23:31:57 -07:00
tschettervictor
c0e2749dbc template: Fix disabled>disable 2025-02-23 12:36:25 -07:00
tschettervictor
1059ee8eec bastille: Redo main cmd as all functions are now handled by common.sh 2025-02-23 12:28:17 -07:00
tschettervictor
be663cf3b3 template: Implement new functions 2025-02-23 12:24:16 -07:00
tschettervictor
2d6b93a939 Merge branch 'master' into master 2025-02-23 12:18:38 -07:00
tschettervictor
18f5404b73 bastille: Limits+Tags to no action commands 2025-02-23 12:16:57 -07:00
tschettervictor
8a84d70c59 tags: Implement new functions 2025-02-23 12:12:45 -07:00
tschettervictor
21b79247ab limits: Implement new functions 2025-02-23 12:11:35 -07:00
tschettervictor
5b2d705019 bastille: Convert and zfs to no action commands 2025-02-23 12:09:13 -07:00
tschettervictor
65b8eea86f zfs: Implement new functions 2025-02-23 12:03:43 -07:00
tschettervictor
268d16e638 convert: Implement new functions 2025-02-23 12:01:52 -07:00
tschettervictor
be96dc996d bastille: service+sysrc to no action commands 2025-02-23 11:58:47 -07:00
tschettervictor
8cd0c60df9 service: Implement new functions 2025-02-23 11:55:11 -07:00
tschettervictor
3944198027 sysrc: Implement new functions 2025-02-23 11:54:12 -07:00
tschettervictor
9f89335309 bastille: Cmd to no action commands 2025-02-23 11:48:23 -07:00
tschettervictor
8371617dbd cmd: Implement new functions 2025-02-23 11:47:40 -07:00
tschettervictor
5f8d7f2bb6 bastille: Move config to no options command 2025-02-23 11:41:22 -07:00
tschettervictor
d387166b9f config: Implement new functions 2025-02-23 11:40:38 -07:00