From 927ebbfd504d408323eae78b4126eb6fb5e149df Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Fri, 21 Feb 2025 17:04:51 -0800
Subject: [PATCH] Installing curl-impersonate.

---
 .gitignore                            | 1 +
 docker-compose.yml                    | 2 --
 docker/newsblur_base_image.Dockerfile | 7 ++++++-
 newsblur_web/settings.py              | 6 ------
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 58bb0b778..730c9abcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,4 @@ media/safari/NewsBlur.safariextz
 .terraform*
 grafana.ini
 apps/api/ip_addresses.txt
+.ansible/
diff --git a/docker-compose.yml b/docker-compose.yml
index 566a8ff21..fbd9d9130 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,7 +9,6 @@ services:
     # user: "${CURRENT_UID}:${CURRENT_GID}"
     environment:
       - DOCKERBUILD=True
-      - DISCOVER_DATA_FOLDER=/srv/newsblur/docker/volumes/discover
       - RUNWITHMAKEBUILD=${RUNWITHMAKEBUILD?Use the `make` command instead of docker CLI}
     stdin_open: true
     tty: true
@@ -172,7 +171,6 @@ services:
       - ${PWD}:/srv/newsblur
     environment:
       - DOCKERBUILD=True
-      - DISCOVER_DATA_FOLDER=/srv/newsblur/docker/volumes/discover
 
   haproxy:
     container_name: haproxy
diff --git a/docker/newsblur_base_image.Dockerfile b/docker/newsblur_base_image.Dockerfile
index 69707132f..b37206adc 100644
--- a/docker/newsblur_base_image.Dockerfile
+++ b/docker/newsblur_base_image.Dockerfile
@@ -23,7 +23,12 @@ RUN       set -ex \
                     zlib1g-dev \
                     ' \
             && apt-get update \
-            && apt-get install -y $rundDeps $buildDeps --no-install-recommends
+            && apt-get install -y $rundDeps $buildDeps --no-install-recommends \
+            && apt-get install -y wget \
+            && wget https://github.com/lexiforest/curl-impersonate/releases/download/v0.9.3/curl-impersonate-v0.9.3.aarch64-linux-gnu.tar.gz \
+            && tar -xzf curl-impersonate-v0.9.3.aarch64-linux-gnu.tar.gz -C /usr/local/bin/ \
+            && rm curl-impersonate-v0.9.3.aarch64-linux-gnu.tar.gz \
+            && chmod +x /usr/local/bin/curl-impersonate-chrome
 COPY      config/requirements.txt /srv/newsblur/
 
 # Install Rust (required for tiktoken)
diff --git a/newsblur_web/settings.py b/newsblur_web/settings.py
index d15433957..4f7b4fc0f 100644
--- a/newsblur_web/settings.py
+++ b/newsblur_web/settings.py
@@ -825,12 +825,6 @@ REDIS_PUBSUB_POOL = redis.ConnectionPool(
 # celeryapp.autodiscover_tasks(INSTALLED_APPS)
 accept_content = ["pickle", "json", "msgpack", "yaml"]
 
-DISCOVER_DATA_FOLDER = os.getenv("DISCOVER_DATA_FOLDER", "/srv/newsblur/docker/volumes/discover")
-# Create the folder if it doesn't exist
-os.makedirs(DISCOVER_DATA_FOLDER, exist_ok=True)
-# Set it as an env var (in case it wasn't set before) so python-surprise sees it
-os.environ["DISCOVER_DATA_FOLDER"] = DISCOVER_DATA_FOLDER
-
 # ==========
 # = Assets =
 # ==========