From 85d9b4a569c6a2d6070a86cbac3e0b7cbe9819f4 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Sat, 10 Dec 2022 17:19:13 -0500
Subject: [PATCH] Fix sending dns servers in dhcp response.

---
 ansible/playbook.yaml                           | 4 ++--
 ansible/roles/bhyve/files/arch.conf             | 2 +-
 ansible/roles/firewall/files/odofreebsd_pf.conf | 2 +-
 ansible/roles/jail_nat_dhcp/files/dhcpd.conf    | 1 +
 ansible/roles/poudriere/tasks/freebsd.yaml      | 3 +++
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ansible/playbook.yaml b/ansible/playbook.yaml
index 2d5f617..3cba5ab 100644
--- a/ansible/playbook.yaml
+++ b/ansible/playbook.yaml
@@ -10,7 +10,7 @@
     # - network
     # - sshd
     # - base
-    # - firewall
+    - firewall
     # - cpu
     # - ntp
     # - hosts
@@ -30,7 +30,7 @@
     # - fuse
     # - autofs
     # - exfat
-    # - bhyve
+    - bhyve
     # - media
     # - kubernetes
     # - google_cloud_sdk
diff --git a/ansible/roles/bhyve/files/arch.conf b/ansible/roles/bhyve/files/arch.conf
index ef6ff6d..18bbf6b 100644
--- a/ansible/roles/bhyve/files/arch.conf
+++ b/ansible/roles/bhyve/files/arch.conf
@@ -13,7 +13,7 @@ console="tmux"
 cpu=1
 memory=1024M
 
-disk0_type="virtio-blk"
+disk0_type="nvme"
 disk0_name="disk0"
 disk0_dev="sparse-zvol"
 virt_random="yes"  # virtio-rnd
diff --git a/ansible/roles/firewall/files/odofreebsd_pf.conf b/ansible/roles/firewall/files/odofreebsd_pf.conf
index 16c77e8..ecb4691 100644
--- a/ansible/roles/firewall/files/odofreebsd_pf.conf
+++ b/ansible/roles/firewall/files/odofreebsd_pf.conf
@@ -42,4 +42,4 @@ 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
+pass on host_uplink1
diff --git a/ansible/roles/jail_nat_dhcp/files/dhcpd.conf b/ansible/roles/jail_nat_dhcp/files/dhcpd.conf
index 36d1f19..aa36935 100644
--- a/ansible/roles/jail_nat_dhcp/files/dhcpd.conf
+++ b/ansible/roles/jail_nat_dhcp/files/dhcpd.conf
@@ -9,4 +9,5 @@ subnet 10.213.177.0 netmask 255.255.255.0 {
   range 10.213.177.10 10.213.177.250;
   option broadcast-address 10.213.177.255;
   option routers 10.213.177.1;
+  option domain-name-servers 10.213.177.1;
 }
diff --git a/ansible/roles/poudriere/tasks/freebsd.yaml b/ansible/roles/poudriere/tasks/freebsd.yaml
index 79477e9..1f7d636 100644
--- a/ansible/roles/poudriere/tasks/freebsd.yaml
+++ b/ansible/roles/poudriere/tasks/freebsd.yaml
@@ -16,6 +16,9 @@
 #
 # List installed packages
 # pkg query -e '%a = 0' '%o' | sort
+#
+# Consider setting the following in the poudriere vm-bhyve config:
+# priority="20"
 
 - name: Install packages
   package: