diff --git a/README.md b/README.md index 69b3def06..7a3266793 100644 --- a/README.md +++ b/README.md @@ -81,6 +81,7 @@ If you would like to offer support, I would appreciate a star on the repository, | ESPHome | ☑️ | | | Fenrus | ☑️ | | | FHEM | ☑️ | | +| FlareSolverr | ⭕ | | | FlowiseAI | ❌ | NPM Error. [Use Docker image](https://docs.flowiseai.com/getting-started). | | Forgejo | ☑️ | | | Frigate | ❌ | Compile Error. [Use Docker image](https://docs.frigate.video/frigate/installation/). | diff --git a/ct/flaresolverr.sh b/ct/flaresolverr.sh index 85cc927a3..5b97c01e0 100644 --- a/ct/flaresolverr.sh +++ b/ct/flaresolverr.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/build.func) +source <(curl -s https://raw.githubusercontent.com/asylumexp/Proxmox/main/misc/build.func) # Copyright (c) 2021-2024 tteck # Author: tteck (tteckster) # Co-Author: remz1337 @@ -57,14 +57,12 @@ function update_script() { header_info if [[ ! -f /etc/systemd/system/flaresolverr.service ]]; then msg_error "No ${APP} Installation Found!"; exit; fi RELEASE=$(wget -q https://github.com/FlareSolverr/FlareSolverr/releases/latest -O - | grep "title>Release" | cut -d " " -f 4) - if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]] || [[ ! -f /opt/${APP}_version.txt ]]; then + if [[ ! -d /opt/flaresolverr ]]; then msg_error "No ${APP} Installation Found!"; exit; fi msg_info "Updating $APP LXC" systemctl stop flaresolverr - wget -q https://github.com/FlareSolverr/FlareSolverr/releases/download/$RELEASE/flaresolverr_linux_x64.tar.gz - tar -xzf flaresolverr_linux_x64.tar.gz -C /opt - rm flaresolverr_linux_x64.tar.gz + cd /opt/flaresolverr + git pull systemctl start flaresolverr - echo "${RELEASE}" >/opt/${APP}_version.txt msg_ok "Updated $APP LXC" else msg_ok "No update required. ${APP} is already at ${RELEASE}" diff --git a/install/flaresolverr-install.sh b/install/flaresolverr-install.sh index 93c7fdd47..c01947a4b 100644 --- a/install/flaresolverr-install.sh +++ b/install/flaresolverr-install.sh @@ -21,21 +21,28 @@ $STD apt-get install -y mc $STD apt-get install -y apt-transport-https $STD apt-get install -y gpg $STD apt-get install -y xvfb +$STD apt-get install -y wget +$STD apt-get install -y git msg_ok "Installed Dependencies" +msg_info "Updating Python3" +$STD apt-get install -y \ + python3 \ + python3-dev \ + python3-pip +rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED +msg_ok "Updated Python3" + msg_info "Installing Chrome" wget -qO- https://dl.google.com/linux/linux_signing_key.pub | gpg --dearmor -o /usr/share/keyrings/google-chrome.gpg -echo "deb [arch=amd64 signed-by=/usr/share/keyrings/google-chrome.gpg] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list +echo "deb [arch=arm64 signed-by=/usr/share/keyrings/google-chrome.gpg] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list $STD apt update $STD apt install -y google-chrome-stable msg_ok "Installed Chrome" msg_info "Installing FlareSolverr" -RELEASE=$(wget -q https://github.com/FlareSolverr/FlareSolverr/releases/latest -O - | grep "title>Release" | cut -d " " -f 4) -$STD wget -q https://github.com/FlareSolverr/FlareSolverr/releases/download/$RELEASE/flaresolverr_linux_x64.tar.gz -$STD tar -xzf flaresolverr_linux_x64.tar.gz -C /opt -$STD rm flaresolverr_linux_x64.tar.gz -echo "${RELEASE}" >/opt/${APPLICATION}_version.txt +$STD git clone https://github.com/FlareSolverr/FlareSolverr /opt/flaresolverr +$STD pip install -r /opt/flaresolverr/requirements.txt msg_ok "Installed FlareSolverr" msg_info "Creating Service" @@ -51,7 +58,7 @@ Type=simple Environment="LOG_LEVEL=info" Environment="CAPTCHA_SOLVER=none" WorkingDirectory=/opt/flaresolverr -ExecStart=/opt/flaresolverr/flaresolverr +ExecStart=python /opt/flaresolverr/src/flaresolverr.py TimeoutStopSec=30 [Install] WantedBy=multi-user.target diff --git a/status.json b/status.json index 8cb9778e8..94f316c32 100644 --- a/status.json +++ b/status.json @@ -155,6 +155,10 @@ "status": "untested", "notes": "" }, + "FlareSolverr LXC": { + "status": "untested", + "notes": "" + }, "FlowiseAI LXC": { "status": "unsupported", "notes": "NPM Error. Use Docker image."