Merge branch 'migrate_jails'

ansible/environments/home/host_vars/homeserver

@@ -10,9 +10,21 @@ pflog_conf:
 network_rc: "homeserver_network.conf"
 rc_conf: "homeserver_rc.conf"
 loader_conf: "homeserver_loader.conf"
+netgraph_config: "setup_netgraph_homeserver"
 cputype: "intel"
 cpu_opt: broadwell
 hwpstate: false
 build_user:
   name: talexander
   group: talexander
+jail_zfs_dataset: zmass/encrypted/jails
+jail_zfs_dataset_mountpoint: /jail/main
+jail_list:
+  - name: cloak
+    conf:
+      src: cloak
+  - name: dagger
+    conf:
+      src: dagger
+bhyve_dataset: zmass/encrypted/vm
+bhyve_list: []

ansible/roles/firewall/files/homeserver_pf.conf

@@ -1,4 +1,6 @@
 ext_if = "{ igb0 igb1 ix0 ix1 wlan0 }"
+jail_net_v4 = "10.193.223.0/24"
+full_nat_v4 = "10.213.177.0/24"
 
 dhcp = "{ bootpc, bootps }"
 # allow = "{ }"
@@ -12,6 +14,11 @@ udp_pass_in = "{ 53 51820 }"
 set skip on lo
 
 # redirections
+nat on $ext_if inet from $jail_net_v4 to { any, !$jail_net_v4 } tag ALLOWED -> (wlan0)
+nat on $ext_if inet from $full_nat_v4 to { any, !$full_nat_v4 } tag ALLOWED -> (wlan0)
+
+rdr on host_uplink0 inet proto {tcp, udp} from any to 10.193.223.1 port 53 tag ALLOWED -> 1.1.1.1 port 53
+rdr on host_uplink1 inet proto {tcp, udp} from any to 10.213.177.1 port 53 tag ALLOWED -> 1.1.1.1 port 53
 
 # filtering
 block log all
@@ -31,3 +38,7 @@ pass in on $ext_if proto tcp to any port $tcp_pass_in
 pass in on $ext_if proto udp to any port $udp_pass_in
 
 pass quick on $ext_if proto udp from any port $dhcp to any port $dhcp
+
+pass in on host_uplink0 proto udp from any to any port { 53 51820 }
+pass out on host_uplink0 proto tcp from any to any port 8081
+pass in on host_uplink1

ansible/roles/gpg/tasks/freebsd.yaml

@@ -6,6 +6,12 @@
       - ccid
       #      - linux_libusb
       - pinentry
+    state: present
+
+- name: Install packages
+  when: graphics_driver is defined
+  package:
+    name:
       - pinentry-qt5
     state: present
 

ansible/roles/gpg/templates/gpg-agent.conf.j2

@@ -4,8 +4,8 @@ use-standard-socket
 default-cache-ttl 600
 max-cache-ttl 7200
 display :0
-{% if os_flavor == "linux" %}
+{% if graphics_driver is defined and os_flavor == "linux" %}
 pinentry-program /usr/bin/pinentry-qt
-{% elif os_flavor == "freebsd" %}
+{% elif graphics_driver is defined and os_flavor == "freebsd" %}
 pinentry-program /usr/local/bin/pinentry-qt5
 {% endif %}

ansible/roles/jail/files/setup_netgraph_homeserver

@@ -0,0 +1,87 @@
+#!/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:
+    ngctl shutdown host_link3:
+    ngctl shutdown host_uplink1:
+    ngctl shutdown host_bridge1:
+}
+
+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
+
+    # Create a bridge for jails given full access to NAT
+    ngctl -d -f - <<EOF
+mkpeer . eiface hook ether
+name .:hook host_uplink1
+EOF
+
+    ngctl -d -f - <<EOF
+mkpeer host_uplink1: bridge ether link0
+name host_uplink1:ether host_bridge1
+EOF
+
+    ngctl -d -f - <<EOF
+mkpeer host_bridge1: eiface link2 ether
+name host_bridge1:link2 host_link3
+EOF
+
+    ifconfig $(ngctl msg 'host_uplink1:' getifname | grep Args | cut -d '"' -f 2) name host_uplink1 10.213.177.1/24 up
+    ifconfig $(ngctl msg 'host_bridge1:link2' getifname | grep Args | cut -d '"' -f 2) name host_link3
+
+}
+
+setup_netgraph_stop() {
+    cleanup
+}
+
+if [ "$1" = "start" ]; then
+    setup_netgraph_start
+elif [ "$1" = "stop" ]; then
+    setup_netgraph_stop
+else
+    >&2 echo "Unrecognized command"
+fi