From 048cc8c3c523506387fe1561596c6d9d9e6f338f Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Tue, 11 Jun 2024 22:58:07 +0100
Subject: [PATCH] flaresolverr tweaks and fixes

---
 roles/flaresolverr/defaults/main.yml                       | 6 +-----
 roles/flaresolverr/tasks/main.yml                          | 7 ++-----
 .../docs/applications/download-tools}/flaresolverr.md      | 2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)
 rename {roles/flaresolverr/docs => website/docs/applications/download-tools}/flaresolverr.md (91%)

diff --git a/roles/flaresolverr/defaults/main.yml b/roles/flaresolverr/defaults/main.yml
index ec3b2a0690..d371415816 100644
--- a/roles/flaresolverr/defaults/main.yml
+++ b/roles/flaresolverr/defaults/main.yml
@@ -3,11 +3,7 @@ flaresolverr_enabled: false
 flaresolverr_available_externally: false
 
 # directories
-flaresolverr_config_directory: "{{ docker_home }}/flaresolverr/config"
-
-# uid / gid
-flaresolverr_user_id: "0"
-flaresolverr_group_id: "0"
+flaresolverr_config_directory: "{{ docker_home }}/flaresolverr"
 
 # network
 flaresolverr_port: "8191"
diff --git a/roles/flaresolverr/tasks/main.yml b/roles/flaresolverr/tasks/main.yml
index 0a744c008d..5898ced3ea 100644
--- a/roles/flaresolverr/tasks/main.yml
+++ b/roles/flaresolverr/tasks/main.yml
@@ -5,9 +5,8 @@
       ansible.builtin.file:
         path: "{{ item }}"
         state: directory
-        # mode: 0755
       with_items:
-        - "{{ docker_home }}/flaresolverr/config"
+        - "{{ flaresolverr_config_directory }}"
 
     - name: FlareSolverr Docker Container
       community.docker.docker_container:
@@ -17,11 +16,9 @@
         volumes:
           - "{{ flaresolverr_config_directory }}:/config:rw"
         ports:
-          - "{{ flaresolverr_port }}:5050"
+          - "{{ flaresolverr_port }}:8191"
         env:
           TZ: "{{ ansible_nas_timezone }}"
-          PUID: "{{ flaresolverr_user_id }}"
-          PGID: "{{ flaresolverr_group_id }}"
         restart_policy: unless-stopped
         memory: "{{ flaresolverr_memory }}"
         labels:
diff --git a/roles/flaresolverr/docs/flaresolverr.md b/website/docs/applications/download-tools/flaresolverr.md
similarity index 91%
rename from roles/flaresolverr/docs/flaresolverr.md
rename to website/docs/applications/download-tools/flaresolverr.md
index f68dad0f55..14e56de628 100644
--- a/roles/flaresolverr/docs/flaresolverr.md
+++ b/website/docs/applications/download-tools/flaresolverr.md
@@ -6,6 +6,6 @@ FlareSolverr is a proxy server to bypass Cloudflare and DDoS-GUARD protection. S
 
 ## Usage
 
-Set `flaresolverr_enabled: true` in your `inventories/<your_inventory>/nas.yml` file.
+Set `flaresolverr_enabled: true` in your `inventories/<your_inventory>/group_vars/nas.yml` file.
 
 The FlareSolverr API can be accessed from <http://ansible_nas_host_or_ip:8191>.