4 files changed, 3 insertions, 79 deletions
diff --git a/roles/jails/18_komga/defaults/main.yml b/roles/jails/18_komga/defaults/main.yml
index 70d0877..3010e4f 100644
--- a/roles/jails/18_komga/defaults/main.yml
+++ b/roles/jails/18_komga/defaults/main.yml
@@ -1,4 +1,4 @@
-userland: "15.0-RELEASE"
+userland: "15.1-RELEASE"
 
 zfs:
   - name: zroot/jails/volumes/komga_data
@@ -9,13 +9,11 @@ nullfs:
     dst: /mnt/manga
 
 pkg:
-  - openjdk25-jre-headless
   - poppler-utils
   - zip
 
-dirs:
-  - /usr/local/etc/rc.d # no packages to set this up automatically
-  - /usr/local/komga
+pkg_custom:
+  - komga
 
 services:
   - komga
diff --git a/roles/jails/18_komga/tasks/main.yml b/roles/jails/18_komga/tasks/main.yml
index b3818e2..41a5ed1 100644
--- a/roles/jails/18_komga/tasks/main.yml
+++ b/roles/jails/18_komga/tasks/main.yml
@@ -2,31 +2,6 @@
     name: jail
     tasks_from: jail_setup
 
-- name: Download komga jar
-  shell: |
-    if [ ! -f /usr/local/komga/komga.jar ]; then
-      mkdir -p /usr/local/komga
-      fetch -qo /usr/local/komga/komga.jar https://github.com/gotson/komga/releases/download/1.24.1/komga-1.24.1.jar
-    fi
-  register: _komga_download
-  changed_when: _komga_download.rc == 0 and 'mkdir' in _komga_download.cmd
-
-- name: Deploy komga wrapper script
-  template:
-    src: "{{ jail_role_dir }}/templates/usr_local_bin_komga"
-    dest: /usr/local/bin/komga
-    owner: root
-    group: wheel
-    mode: "0755"
-
-- name: Deploy komga rc.d script
-  template:
-    src: "{{ jail_role_dir }}/templates/usr_local_etc_rc.d_komga"
-    dest: /usr/local/etc/rc.d/komga
-    owner: root
-    group: wheel
-    mode: "0755"
-
 - name: Deploy convert-pdfs script
   template:
     src: "{{ jail_role_dir }}/templates/usr_local_bin_convert_pdfs"
diff --git a/roles/jails/18_komga/templates/usr_local_bin_komga b/roles/jails/18_komga/templates/usr_local_bin_komga
deleted file mode 100644
index 47cf18c..0000000
--- a/roles/jails/18_komga/templates/usr_local_bin_komga
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/local/bin/java -jar /usr/local/komga/komga.jar --server.port=80 --komga.config-dir=/var/db/komga
diff --git a/roles/jails/18_komga/templates/usr_local_etc_rc.d_komga b/roles/jails/18_komga/templates/usr_local_etc_rc.d_komga
deleted file mode 100644
index 750b774..0000000
--- a/roles/jails/18_komga/templates/usr_local_etc_rc.d_komga
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: komga
-# REQUIRE: NETWORKING
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="komga"
-rcvar="komga_enable"
-pidfile="/var/run/${name}.pid"
-
-load_rc_config "$name"
-
-: ${komga_enable:="NO"}
-
-start_cmd="${name}_start"
-stop_cmd="${name}_stop"
-status_cmd="${name}_status"
-
-komga_start()
-{
-	echo "Starting ${name}..."
-	daemon -p "${pidfile}" -o /var/log/komga.log \
-		/usr/local/bin/komga
-}
-
-komga_stop()
-{
-	if [ -f "${pidfile}" ]; then
-		echo "Stopping ${name}..."
-		kill "$(cat "${pidfile}")" 2>/dev/null
-		rm -f "${pidfile}"
-	fi
-}
-
-komga_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
-}
-
-run_rc_command "$1"