Transition the home server to the dynamic netgraph devices.

This commit is contained in:
Tom Alexander
2023-04-27 16:58:06 -04:00
parent 24bfa840ff
commit 8867761939
4 changed files with 20 additions and 58 deletions

View File

@@ -1,8 +1,11 @@
cloak {
path = "/jail/main/jails/cloak";
path = "/jail/main/jails/${name}";
vnet;
vnet.interface += "host_link2";
vnet.interface += "wg_uplink0";
exec.prestart += "/usr/local/bin/jail_netgraph_bridge start restricted_nat jail${name} 10.215.2.1/24";
exec.poststop += "/usr/local/bin/jail_netgraph_bridge stop restricted_nat jail${name}";
vnet.interface += "jail${name}";
vnet.interface += "cloak";
devfs_ruleset = 13;
mount.devfs; # To expose tun device

View File

@@ -1,7 +1,7 @@
dagger {
path = "/jail/main/jails/dagger";
path = "/jail/main/jails/${name}";
vnet;
vnet.interface += "wg_link2";
vnet.interface += "dagger";
exec.start += "/bin/sh /etc/rc";
exec.stop = "/bin/sh /etc/rc.shutdown jail";

View File

@@ -1,56 +1,13 @@
#!/usr/local/bin/bash
cleanup() {
# ngctl shutdown host_link2:
# ngctl shutdown host_uplink0:
# ngctl shutdown host_bridge0:
# ngctl shutdown wg_link2:
# ngctl shutdown wg_uplink0:
# ngctl shutdown wg_bridge0:
echo ""
/usr/local/bin/jail_netgraph_bridge stop cloak dagger
}
setup_netgraph_start() {
cleanup
# # Create a bridge for jails that only speak wireguard
# ngctl -d -f - <<EOF
# mkpeer . eiface hook ether
# name .:hook host_uplink0
# EOF
# ngctl -d -f - <<EOF
# mkpeer host_uplink0: bridge ether link0
# name host_uplink0:ether host_bridge0
# EOF
# ngctl -d -f - <<EOF
# mkpeer host_bridge0: eiface link2 ether
# name host_bridge0:link2 host_link2
# EOF
# ifconfig $(ngctl msg 'host_uplink0:' getifname | grep Args | cut -d '"' -f 2) name host_uplink0 10.193.223.1/24 up
# ifconfig $(ngctl msg 'host_bridge0:link2' getifname | grep Args | cut -d '"' -f 2) name host_link2
# # Create internal bridge for jails that are forced through wireguard
# ngctl -d -f - <<EOF
# mkpeer . eiface hook ether
# name .:hook wg_uplink0
# EOF
# ngctl -d -f - <<EOF
# mkpeer wg_uplink0: bridge ether link0
# name wg_uplink0:ether wg_bridge0
# EOF
# ngctl -d -f - <<EOF
# mkpeer wg_bridge0: eiface link2 ether
# name wg_bridge0:link2 wg_link2
# EOF
# ifconfig $(ngctl msg 'wg_uplink0:' getifname | grep Args | cut -d '"' -f 2) name wg_uplink0 10.241.199.1/24 up
# ifconfig $(ngctl msg 'wg_bridge0:link2' getifname | grep Args | cut -d '"' -f 2) name wg_link2
/usr/local/bin/jail_netgraph_bridge start cloak dagger 192.168.1.0/24
}
setup_netgraph_stop() {