3 files changed, 6 insertions, 43 deletions
diff --git a/roles/jails/14_freshrss/defaults/main.yml b/roles/jails/14_freshrss/defaults/main.yml
index 6804a0f..447d93b 100644
--- a/roles/jails/14_freshrss/defaults/main.yml
+++ b/roles/jails/14_freshrss/defaults/main.yml
@@ -1,36 +1,16 @@
-userland: "15.0-RELEASE"
+userland: "15.1-RELEASE"
 
 zfs:
   - name: zroot/jails/volumes/freshrss_data
-    mountpoint: /usr/local/FreshRSS/data
+    mountpoint: /var/db/freshrss
     owner: "80"
     group: "80"
 
 pkg:
-  - pcre2
   - nginx
-  - php82
-  - php82-ctype
-  - php82-curl
-  - php82-dom
-  - php82-filter
-  - php82-gd
-  - php82-iconv
-  - php82-mbstring
-  - php82-opcache
-  - php82-pdo
-  - php82-pdo_sqlite
-  - php82-phar
-  - php82-posix
-  - php82-session
-  - php82-simplexml
-  - php82-sqlite3
-  - php82-tokenizer
-  - php82-xml
-  - php82-xmlreader
-  - php82-xmlwriter
-  - php82-zip
-  - php82-extensions
+
+pkg_custom:
+  - freshrss-php84
 
 files:
   - src: usr_local_etc_nginx_nginx.conf
diff --git a/roles/jails/14_freshrss/tasks/main.yml b/roles/jails/14_freshrss/tasks/main.yml
index 50b8e7c..460b037 100644
--- a/roles/jails/14_freshrss/tasks/main.yml
+++ b/roles/jails/14_freshrss/tasks/main.yml
@@ -2,16 +2,6 @@
     name: jail
     tasks_from: jail_setup
 
-- name: Download FreshRSS
-  shell: |
-    if [ ! -f /usr/local/FreshRSS/constants.php ]; then
-      fetch -qo /tmp/freshrss.tar.gz https://github.com/FreshRSS/FreshRSS/archive/refs/heads/edge.tar.gz
-      tar -xf /tmp/freshrss.tar.gz --strip-components=1 -C /usr/local/FreshRSS
-      rm -f /tmp/freshrss.tar.gz
-    fi
-  register: _freshrss_download
-  changed_when: "'constants.php' not in _freshrss_download.cmd"
-
 - name: Create php-fpm socket directory
   file:
     path: /var/run/php
@@ -20,13 +10,6 @@
     group: www
     mode: "0755"
 
-- name: Symlink FreshRSS public to webroot
-  file:
-    src: /usr/local/FreshRSS/p
-    dest: /var/www
-    state: link
-    force: true
-
 - import_role:
     name: jail
     tasks_from: jail_launch
diff --git a/roles/jails/14_freshrss/templates/usr_local_etc_nginx_nginx.conf b/roles/jails/14_freshrss/templates/usr_local_etc_nginx_nginx.conf
index f486e13..5bdeede 100644
--- a/roles/jails/14_freshrss/templates/usr_local_etc_nginx_nginx.conf
+++ b/roles/jails/14_freshrss/templates/usr_local_etc_nginx_nginx.conf
@@ -15,7 +15,7 @@ http {
         listen 80;
         server_name freshrss.jan.systems;
 
-        root /var/www;
+        root /usr/local/www/freshrss/p;
         index index.php index.html index.htm;
 
         access_log /var/log/freshrss.access.log;