Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow inherit/ip_hostname as IP options #830

Merged
merged 24 commits into from
Feb 23, 2025
Merged

Allow inherit/ip_hostname as IP options #830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
462a019
create: Add ip_hostname/inherit options
tschettervictor Jan 29, 2025
7958718
create: Restore ruleset var
tschettervictor Jan 29, 2025
eb1ebff
stop: Allow multiple IPs in jails
tschettervictor Jan 29, 2025
b3d9e3e
start: Allow multiple interface and IPs
tschettervictor Jan 29, 2025
d0d46c1
stop: Fix copyright year
tschettervictor Jan 31, 2025
66d1286
Merge branch 'BastilleBSD:master' into patch-2
tschettervictor Feb 3, 2025
73d510a
Bastille: Stop to no action commands
tschettervictor Feb 3, 2025
7b6e7c4
Merge branch 'master' into patch-2
tschettervictor Feb 3, 2025
e8cb90c
Merge branch 'BastilleBSD:master' into patch-2
tschettervictor Feb 16, 2025
a1e58f4
start: Fix IP not being added to firewal
tschettervictor Feb 17, 2025
1245b0e
start: Do not add IP to firewall table if it is in the same subnet
tschettervictor Feb 20, 2025
fdc05f6
Merge branch 'BastilleBSD:master' into patch-2
tschettervictor Feb 20, 2025
38020a4
Merge branch 'BastilleBSD:master' into patch-2
tschettervictor Feb 23, 2025
6193fa3
template: Use new style of interface|ip pair
tschettervictor Feb 23, 2025
8f6599f
template: Trim trailing slash from jail ip
tschettervictor Feb 23, 2025
4b092e5
template: jail_ip > jail_ip4
tschettervictor Feb 23, 2025
2ed27f5
template: Fix booboo
tschettervictor Feb 23, 2025
f0063b4
template: FIx booboo
tschettervictor Feb 23, 2025
f06788e
Update template.sh
tschettervictor Feb 23, 2025
1ef0de5
template: One more fix for IP
tschettervictor Feb 23, 2025
c2421ad
template: Code cleanup for getting IP
tschettervictor Feb 23, 2025
efa279b
template: Support old style IP/interface pair
tschettervictor Feb 23, 2025
d799fa3
template: Fix shellcheck
tschettervictor Feb 23, 2025
87e9aff
template: Print only the first IP for the jail
tschettervictor Feb 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions usr/local/bin/bastille
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,10 @@ version|-v|--version)
help|-h|--help)
usage
;;
bootstrap|clone|console|create|cp|destroy|etcupdate|export|htop|import|jcp|list|mount|pkg|rcp|rdr|rename|restart|setup|start|top|umount|update|upgrade|verify)
bootstrap|clone|console|create|cp|destroy|etcupdate|export|htop|import|jcp|list|mount|pkg|rcp|rdr|rename|restart|setup|start|stop|top|umount|update|upgrade|verify)
# Nothing "extra" to do for these commands. -- cwells
;;
config|cmd|convert|edit|limits|service|stop|sysrc|tags|template|zfs)
config|cmd|convert|edit|limits|service|sysrc|tags|template|zfs)
# Parse the target and ensure it exists. -- cwells
if [ $# -eq 0 ]; then # No target was given, so show the command's help. -- cwells
PARAMS='help'
Expand Down
Loading