Use poudriere built packages, upgrade to 15.1

3 files changed, 10 insertions, 72 deletions

diff --git a/roles/jails/03_irc_thelounge/defaults/main.yml b/roles/jails/03_irc_thelounge/defaults/main.yml
index 858df0e..cc29940 100644
--- a/roles/jails/03_irc_thelounge/defaults/main.yml
+++ b/roles/jails/03_irc_thelounge/defaults/main.yml
@@ -1,19 +1,11 @@
-userland: "15.0-RELEASE"
+userland: "15.1-RELEASE"
 
 zfs:
   - name: zroot/jails/volumes/irc_thelounge
     mountpoint: /var/db/thelounge
 
-pkg:
-  - pcre2
-  - npm-node24
-  - yarn-node24
-  - git
-
-files:
-  - src: usr_local_etc_rc.d_thelounge
-    dest: /usr/local/etc/rc.d/thelounge
-    mode: "0755"
+pkg_custom:
+  - thelounge
 
 services:
   - thelounge
diff --git a/roles/jails/03_irc_thelounge/tasks/main.yml b/roles/jails/03_irc_thelounge/tasks/main.yml
index f21ff80..2dcc44c 100644
--- a/roles/jails/03_irc_thelounge/tasks/main.yml
+++ b/roles/jails/03_irc_thelounge/tasks/main.yml
@@ -2,22 +2,13 @@
     name: jail
     tasks_from: jail_setup
 
-- name: Clone thelounge
-  shell: |
-    git clone --depth 1 --branch v4.4.3 https://github.com/thelounge/thelounge.git /usr/local/share/thelounge
-  args:
-    creates: /usr/local/share/thelounge
-
-- name: Install thelounge dependencies and build
-  shell: cd /usr/local/share/thelounge && yarn install && NODE_ENV=production yarn build
-  args:
-    creates: /usr/local/share/thelounge/dist
-
-- name: Link thelounge binary
-  file:
-    src: /usr/local/share/thelounge/index.js
-    dest: /usr/local/bin/thelounge
-    state: link
+- name: Set thelounge user and group
+  community.general.sysrc:
+    name: "{{ item.name }}"
+    value: "{{ item.value }}"
+  loop:
+    - { name: thelounge_user, value: root }
+    - { name: thelounge_group, value: wheel }
 
 - name: Deploy thelounge config
   copy:
diff --git a/roles/jails/03_irc_thelounge/templates/usr_local_etc_rc.d_thelounge b/roles/jails/03_irc_thelounge/templates/usr_local_etc_rc.d_thelounge
deleted file mode 100644
index 16afd5d..0000000
--- a/roles/jails/03_irc_thelounge/templates/usr_local_etc_rc.d_thelounge
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: thelounge
-# REQUIRE: NETWORKING
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="thelounge"
-rcvar="thelounge_enable"
-
-thelounge_env="THELOUNGE_HOME=/var/db/thelounge PATH=$PATH:/usr/local/bin"
-pidfile="/var/run/${name}.pid"
-
-start_cmd="${name}_start"
-stop_cmd="${name}_stop"
-status_cmd="${name}_status"
-
-thelounge_start()
-{
-    echo "Starting ${name}..."
-    env ${thelounge_env} daemon -p ${pidfile} -o /var/log/thelounge.log /usr/local/bin/thelounge start
-}
-
-thelounge_stop()
-{
-    if [ -f ${pidfile} ]; then
-        echo "Stopping ${name}..."
-        kill $(cat ${pidfile}) 2>/dev/null
-        rm -f ${pidfile}
-    fi
-}
-
-thelounge_status()
-{
-    if [ -f ${pidfile} ] && kill -0 $(cat ${pidfile}) 2>/dev/null; then
-        echo "${name} is running as pid $(cat ${pidfile})"
-    else
-        echo "${name} is not running"
-        return 1
-    fi
-}
-
-load_rc_config $name
-run_rc_command "$1"