From adda76f587a671bf29539330633f044bfe60c334 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Sun, 21 Sep 2025 08:28:39 +0200 Subject: [PATCH] caddy: modify disk size and implement xCaddy update (#7775) --- ct/caddy.sh | 17 +++++++++++++++-- frontend/public/json/caddy.json | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ct/caddy.sh b/ct/caddy.sh index 3a9203e79..e782abd8d 100644 --- a/ct/caddy.sh +++ b/ct/caddy.sh @@ -9,7 +9,7 @@ APP="Caddy" var_tags="${var_tags:-webserver}" var_cpu="${var_cpu:-1}" var_ram="${var_ram:-512}" -var_disk="${var_disk:-4}" +var_disk="${var_disk:-6}" var_os="${var_os:-debian}" var_version="${var_version:-12}" var_unprivileged="${var_unprivileged:-1}" @@ -31,6 +31,19 @@ function update_script() { $STD apt-get update $STD apt-get -y upgrade msg_ok "Updated $APP LXC" + + if command -v xcaddy >/dev/null 2>&1; then + install_go + msg_info "Updating xCaddy" + cd /opt + RELEASE=$(curl -fsSL https://api.github.com/repos/caddyserver/xcaddy/releases/latest | grep "tag_name" | awk -F '"' '{print $4}') + VERSION="${RELEASE#v}" + curl -fsSL "https://github.com/caddyserver/xcaddy/releases/download/${RELEASE}/xcaddy_${VERSION}_linux_amd64.deb" -o "xcaddy_${VERSION}_linux_amd64.deb" + $STD dpkg -i "xcaddy_${VERSION}_linux_amd64.deb" + rm -f "xcaddy_${VERSION}_linux_amd64.deb" + $STD xcaddy build + msg_ok "Updated xCaddy" + fi exit } @@ -41,4 +54,4 @@ description msg_ok "Completed Successfully!\n" echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}" echo -e "${INFO}${YW} Access it using the following URL:${CL}" -echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:80${CL}" \ No newline at end of file +echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:80${CL}" diff --git a/frontend/public/json/caddy.json b/frontend/public/json/caddy.json index b1dbe4d2f..dec01dcf0 100644 --- a/frontend/public/json/caddy.json +++ b/frontend/public/json/caddy.json @@ -21,7 +21,7 @@ "resources": { "cpu": 1, "ram": 512, - "hdd": 4, + "hdd": 6, "os": "debian", "version": "12" }