Set up poudriere custom repo

2 files changed, 21 insertions, 3 deletions

diff --git a/roles/jail/tasks/jail_setup.yml b/roles/jail/tasks/jail_setup.yml
index 538fc6e..9504ea9 100644
--- a/roles/jail/tasks/jail_setup.yml
+++ b/roles/jail/tasks/jail_setup.yml
@@ -250,6 +250,27 @@
   delegate_to: "{{ jail_delegate_host }}"
 
 # In-jail provisioning
+- name: Create pkg repos directory
+  file:
+    path: /usr/local/etc/pkg/repos
+    state: directory
+    owner: root
+    group: wheel
+    mode: "0755"
+
+- name: Configure poudriere repo in jail
+  copy:
+    content: |
+      poudriere: {
+        url: "http://{{ jail_lan_cidr | ipv4_nth(21 + jail_lan_offset | int) }}/packages",
+        enabled: no,
+        priority: 100
+      }
+    dest: /usr/local/etc/pkg/repos/poudriere.conf
+    owner: root
+    group: wheel
+    mode: "0644"
+
 - name: Set default Python version
   copy:
     content: "DEFAULT_VERSIONS+=python=3.12 python3=3.12\n"
diff --git a/roles/jail/templates/jail_conf.j2 b/roles/jail/templates/jail_conf.j2
index 68a7c21..2a0ea27 100644
--- a/roles/jail/templates/jail_conf.j2
+++ b/roles/jail/templates/jail_conf.j2
@@ -53,7 +53,4 @@
   exec.prestart += "mount -t nullfs {{ mount.src }} /usr/local/jails/containers/{{ jail.name }}{{ mount.dst }} || true";
   exec.poststop += "umount /usr/local/jails/containers/{{ jail.name }}{{ mount.dst }} || true";
 {% endfor %}
-  exec.prestart += "mkdir -p /usr/local/jails/containers/{{ jail.name }}/usr/ports";
-  exec.prestart += "mount -t nullfs -o ro /usr/ports /usr/local/jails/containers/{{ jail.name }}/usr/ports || true";
-  exec.poststop += "umount /usr/local/jails/containers/{{ jail.name }}/usr/ports || true";
 }