12 files changed, 88 insertions, 34 deletions
diff --git a/roles/jails/01_ingress/defaults/main.yml b/roles/jails/01_ingress/defaults/main.yml
index 0774424..e507905 100644
--- a/roles/jails/01_ingress/defaults/main.yml
+++ b/roles/jails/01_ingress/defaults/main.yml
@@ -22,6 +22,7 @@ ingress_routes:
   - { host: plex.jan.systems, jail: plex, port: 32400, presets: [streaming] }
   - { host: komga.jan.systems, jail: komga }
   - { host: goaccess.jan.systems, jail: goaccess }
+  - { host: poudriere.jan.systems, jail: poudriere_repo }
 
 cert_domains:
   - "jan.systems"
diff --git a/roles/jails/04_taulubot/tasks/main.yml b/roles/jails/04_taulubot/tasks/main.yml
index e45b2d9..9116fc4 100644
--- a/roles/jails/04_taulubot/tasks/main.yml
+++ b/roles/jails/04_taulubot/tasks/main.yml
@@ -2,13 +2,10 @@
     name: jail
     tasks_from: jail_setup
 
-- name: Install taulubot from port
-  shell: |
-    cd /usr/ports/net-im/taulubot
-    make install WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles
+- name: Install taulubot
+  shell: pkg install -y -r poudriere taulubot
   register: _taulubot_install
-  failed_when: "_taulubot_install.rc != 0"
-  changed_when: "'Installing taulubot' in _taulubot_install.stdout"
+  changed_when: "'Installing' in _taulubot_install.stdout"
 
 - name: Deploy bot token file
   copy:
diff --git a/roles/jails/06_hommabot/tasks/main.yml b/roles/jails/06_hommabot/tasks/main.yml
index d19beb1..b3c4481 100644
--- a/roles/jails/06_hommabot/tasks/main.yml
+++ b/roles/jails/06_hommabot/tasks/main.yml
@@ -2,11 +2,10 @@
     name: jail
     tasks_from: jail_setup
 
-- name: Install hommabot from port
-  shell: cd /usr/ports/net-im/hommabot && make install WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles
+- name: Install hommabot
+  shell: pkg install -y -r poudriere hommabot
   register: _hommabot_install
-  failed_when: "_hommabot_install.rc != 0"
-  changed_when: "'Installing hommabot' in _hommabot_install.stdout"
+  changed_when: "'Installing' in _hommabot_install.stdout"
 
 - name: Deploy bot token file
   copy:
diff --git a/roles/jails/07_aggro/tasks/main.yml b/roles/jails/07_aggro/tasks/main.yml
index 175fd80..a7194e5 100644
--- a/roles/jails/07_aggro/tasks/main.yml
+++ b/roles/jails/07_aggro/tasks/main.yml
@@ -2,11 +2,10 @@
     name: jail
     tasks_from: jail_setup
 
-- name: Install aggro from port
-  shell: cd /usr/ports/www/aggro && make install WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles
+- name: Install aggro
+  shell: pkg install -y -r poudriere aggro
   register: _aggro_install
-  failed_when: "_aggro_install.rc != 0 and 'already installed' not in _aggro_install.stdout"
-  changed_when: "'already installed' not in _aggro_install.stdout"
+  changed_when: "'Installing' in _aggro_install.stdout"
 
 - name: Deploy aggro env file
   template:
diff --git a/roles/jails/08_diddle/tasks/main.yml b/roles/jails/08_diddle/tasks/main.yml
index e5b9c7f..69a68d2 100644
--- a/roles/jails/08_diddle/tasks/main.yml
+++ b/roles/jails/08_diddle/tasks/main.yml
@@ -2,11 +2,10 @@
     name: jail
     tasks_from: jail_setup
 
-- name: Install diddle from port
-  shell: cd /usr/ports/www/diddle && make install WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles
+- name: Install diddle
+  shell: pkg install -y -r poudriere diddle
   register: _diddle_install
-  failed_when: "_diddle_install.rc != 0"
-  changed_when: "'Installing diddle' in _diddle_install.stdout"
+  changed_when: "'Installing' in _diddle_install.stdout"
 
 - name: Deploy diddle env file
   template:
diff --git a/roles/jails/11_spliit/tasks/main.yml b/roles/jails/11_spliit/tasks/main.yml
index d3f62e1..ef793b9 100644
--- a/roles/jails/11_spliit/tasks/main.yml
+++ b/roles/jails/11_spliit/tasks/main.yml
@@ -2,11 +2,10 @@
     name: jail
     tasks_from: jail_setup
 
-- name: Install expense-tracker from port
-  shell: cd /usr/ports/www/expense-tracker && make install WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles
+- name: Install expense-tracker
+  shell: pkg install -y -r poudriere expense-tracker
   register: _spliit_install
-  failed_when: "_spliit_install.rc != 0 and 'already installed' not in _spliit_install.stdout"
-  changed_when: "'already installed' not in _spliit_install.stdout"
+  changed_when: "'Installing' in _spliit_install.stdout"
 
 - name: Configure expense_tracker
   community.general.sysrc:
diff --git a/roles/jails/13_plex/tasks/main.yml b/roles/jails/13_plex/tasks/main.yml
index 438d6be..3effb64 100644
--- a/roles/jails/13_plex/tasks/main.yml
+++ b/roles/jails/13_plex/tasks/main.yml
@@ -2,11 +2,10 @@
     name: jail
     tasks_from: jail_setup
 
-- name: Install plexmediaserver from port
-  shell: cd /usr/ports/multimedia/plexmediaserver && make install BATCH=yes WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles
+- name: Install plexmediaserver
+  shell: pkg install -y -r poudriere plexmediaserver
   register: _plex_install
-  failed_when: "_plex_install.rc != 0 and 'already installed' not in _plex_install.stdout"
-  changed_when: "'already installed' not in _plex_install.stdout"
+  changed_when: "'Installing' in _plex_install.stdout"
 
 - import_role:
     name: jail
diff --git a/roles/jails/15_paste/tasks/main.yml b/roles/jails/15_paste/tasks/main.yml
index 2c11f34..7ba86c9 100644
--- a/roles/jails/15_paste/tasks/main.yml
+++ b/roles/jails/15_paste/tasks/main.yml
@@ -2,11 +2,10 @@
     name: jail
     tasks_from: jail_setup
 
-- name: Install pastebin from port
-  shell: cd /usr/ports/www/pastebin && make install BATCH=yes WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles
+- name: Install pastebin
+  shell: pkg install -y -r poudriere pastebin
   register: _paste_install
-  failed_when: "_paste_install.rc != 0 and 'already installed' not in _paste_install.stdout"
-  changed_when: "'already installed' not in _paste_install.stdout"
+  changed_when: "'Installing' in _paste_install.stdout"
 
 - import_role:
     name: jail
diff --git a/roles/jails/19_leolalla_fi/tasks/main.yml b/roles/jails/19_leolalla_fi/tasks/main.yml
index 413f930..4a33140 100644
--- a/roles/jails/19_leolalla_fi/tasks/main.yml
+++ b/roles/jails/19_leolalla_fi/tasks/main.yml
@@ -2,11 +2,10 @@
     name: jail
     tasks_from: jail_setup
 
-- name: Install gdrive-photo-gallery from port
-  shell: cd /usr/ports/www/gdrive-photo-gallery && make install BATCH=yes WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles
+- name: Install gdrive-photo-gallery
+  shell: pkg install -y -r poudriere gdrive-photo-gallery
   register: _gallery_install
-  failed_when: "_gallery_install.rc != 0 and 'already installed' not in _gallery_install.stdout"
-  changed_when: "'already installed' not in _gallery_install.stdout"
+  changed_when: "'Installing' in _gallery_install.stdout"
 
 - name: Deploy environment file
   template:
diff --git a/roles/jails/21_poudriere_repo/defaults/main.yml b/roles/jails/21_poudriere_repo/defaults/main.yml
new file mode 100644
index 0000000..108c494
--- /dev/null
+++ b/roles/jails/21_poudriere_repo/defaults/main.yml
@@ -0,0 +1,19 @@
+userland: "15.0-RELEASE"
+
+nullfs:
+  - src: /usr/local/share/poudriere/html
+    dst: /mnt/poudriere-html
+  - src: /usr/local/poudriere/data/logs
+    dst: /mnt/poudriere-logs
+  - src: /usr/local/poudriere/data/packages
+    dst: /mnt/poudriere-packages
+
+pkg:
+  - nginx
+
+files:
+  - src: usr_local_etc_nginx_nginx.conf
+    dest: /usr/local/etc/nginx/nginx.conf
+
+services:
+  - nginx
diff --git a/roles/jails/21_poudriere_repo/tasks/main.yml b/roles/jails/21_poudriere_repo/tasks/main.yml
new file mode 100644
index 0000000..3a8383d
--- /dev/null
+++ b/roles/jails/21_poudriere_repo/tasks/main.yml
@@ -0,0 +1,11 @@
+- import_role:
+    name: jail
+    tasks_from: jail_setup
+
+- name: Add log extension to mime.types
+  shell: sed -i '' -E 's|text/plain[\t\ ]*txt|text/plain txt log|g' /usr/local/etc/nginx/mime.types
+  changed_when: false
+
+- import_role:
+    name: jail
+    tasks_from: jail_launch
diff --git a/roles/jails/21_poudriere_repo/templates/usr_local_etc_nginx_nginx.conf b/roles/jails/21_poudriere_repo/templates/usr_local_etc_nginx_nginx.conf
new file mode 100644
index 0000000..5599ef9
--- /dev/null
+++ b/roles/jails/21_poudriere_repo/templates/usr_local_etc_nginx_nginx.conf
@@ -0,0 +1,33 @@
+worker_processes 1;
+
+events {
+    worker_connections 128;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+    sendfile      on;
+
+    server {
+        listen 80;
+        server_name _;
+
+        root /mnt/poudriere-html;
+        index index.html;
+
+        location /data {
+            alias /mnt/poudriere-logs/bulk;
+            autoindex on;
+        }
+
+        location /packages {
+            alias /mnt/poudriere-packages/poudriere_build-quarterly/.latest;
+            autoindex on;
+        }
+
+        location / {
+            try_files $uri $uri/ =404;
+        }
+    }
+}