diff --git a/ct/cloudflared.sh b/ct/cloudflared.sh index 255e56e7c..90c1842f4 100644 --- a/ct/cloudflared.sh +++ b/ct/cloudflared.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-1}" var_ram="${var_ram:-512}" var_disk="${var_disk:-2}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -20,18 +20,18 @@ color catch_errors function update_script() { - header_info - check_container_storage - check_container_resources - if [[ ! -d /var ]]; then - msg_error "No ${APP} Installation Found!" - exit - fi - msg_info "Updating $APP LXC" - $STD apt-get update - $STD apt-get -y upgrade - msg_ok "Updated $APP LXC" - exit + header_info + check_container_storage + check_container_resources + if [[ ! -f /etc/systemd/system/cloudflared.service ]]; then + msg_error "No ${APP} Installation Found!" + exit + fi + msg_info "Updating $APP LXC" + $STD apt update + $STD apt -y upgrade + msg_ok "Updated $APP LXC" + exit } start @@ -39,4 +39,4 @@ build_container description msg_ok "Completed Successfully!\n" -echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}" \ No newline at end of file +echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}" diff --git a/frontend/public/json/cloudflared.json b/frontend/public/json/cloudflared.json index 1b0270015..b0952d53a 100644 --- a/frontend/public/json/cloudflared.json +++ b/frontend/public/json/cloudflared.json @@ -23,7 +23,7 @@ "ram": 512, "hdd": 2, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/install/cloudflared-install.sh b/install/cloudflared-install.sh index b86d319da..1e7fde831 100644 --- a/install/cloudflared-install.sh +++ b/install/cloudflared-install.sh @@ -15,11 +15,16 @@ update_os msg_info "Installing Cloudflared" mkdir -p --mode=0755 /usr/share/keyrings -VERSION="$(awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release)" curl -fsSL https://pkg.cloudflare.com/cloudflare-main.gpg >/usr/share/keyrings/cloudflare-main.gpg -echo "deb [signed-by=/usr/share/keyrings/cloudflare-main.gpg] https://pkg.cloudflare.com/cloudflared $VERSION main" >/etc/apt/sources.list.d/cloudflared.list -$STD apt-get update -$STD apt-get install -y cloudflared +cat </etc/apt/sources.list.d/cloudflared.sources +Types: deb +URIs: https://pkg.cloudflare.com/cloudflared/ +Suites: any +Components: main +Signed-By: /usr/share/keyrings/cloudflare-main.gpg +EOF +$STD apt update +$STD apt install -y cloudflared msg_ok "Installed Cloudflared" read -r -p "${TAB3}Would you like to configure cloudflared as a DNS-over-HTTPS (DoH) proxy? " prompt @@ -61,6 +66,7 @@ motd_ssh customize msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean +$STD apt -y autoremove +$STD apt -y autoclean +$STD apt -y clean msg_ok "Cleaned"