diff --git a/ct/blocky.sh b/ct/blocky.sh index 6763536ff..4981835a6 100644 --- a/ct/blocky.sh +++ b/ct/blocky.sh @@ -3,7 +3,7 @@ source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxV # Copyright (c) 2021-2025 tteck # Author: tteck (tteckster) # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE -# Source: https://0xerr0r.github.io/blocky/latest/ +# Source: https://0xerr0r.github.io/blocky APP="Blocky" var_tags="${var_tags:-adblock}" @@ -20,18 +20,38 @@ 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" + header_info + check_container_storage + check_container_resources + if [[ ! -d /opt/blocky ]]; then + msg_error "No ${APP} Installation Found!" exit + fi + if check_for_gh_release "blocky" "0xERR0R/blocky"; then + msg_info "Stopping Service" + systemctl stop blocky + msg_ok "Stopped Service" + + msg_info "Backup Config" + mv /opt/blocky/config.yml /opt/config.yml + msg_ok "Backed Up Config" + + msg_info "Removing Old Version" + rm -rf /opt/blocky + msg_ok "Removed Old Version" + + fetch_and_deploy_gh_release "blocky" "0xERR0R/blocky" "prebuild" "latest" "/opt/blocky" "blocky_*_linux_x86_64.tar.gz" + + msg_info "Restore Config" + mv /opt/config.yml /opt/blocky/config.yml + msg_ok "Restored Config" + + msg_info "Starting Service" + systemctl start blocky + msg_ok "Started Service" + msg_ok "Updated Successfully" + fi + exit } start @@ -41,4 +61,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}:4000${CL}" \ No newline at end of file +echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:4000${CL}" diff --git a/frontend/public/json/blocky.json b/frontend/public/json/blocky.json index 1cc6cfb1b..c61996838 100644 --- a/frontend/public/json/blocky.json +++ b/frontend/public/json/blocky.json @@ -6,7 +6,7 @@ ], "date_created": "2024-05-02", "type": "ct", - "updateable": false, + "updateable": true, "privileged": false, "interface_port": 4000, "documentation": "https://0xerr0r.github.io/blocky/latest/configuration/", diff --git a/install/blocky-install.sh b/install/blocky-install.sh index a6b464793..7d7a96b69 100644 --- a/install/blocky-install.sh +++ b/install/blocky-install.sh @@ -3,7 +3,7 @@ # Copyright (c) 2021-2025 tteck # Author: tteck (tteckster) # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE -# Source: https://0xerr0r.github.io/blocky/latest/ +# Source: https://0xerr0r.github.io/blocky source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" color @@ -13,14 +13,12 @@ setting_up_container network_check update_os -msg_info "Installing Blocky" +fetch_and_deploy_gh_release "blocky" "0xERR0R/blocky" "prebuild" "latest" "/opt/blocky" "blocky_*_linux_x86_64.tar.gz" + +msg_info "Configuring Blocky" if systemctl is-active systemd-resolved >/dev/null 2>&1; then systemctl disable -q --now systemd-resolved fi -mkdir /opt/blocky -RELEASE=$(curl -fsSL https://api.github.com/repos/0xERR0R/blocky/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') -curl -fsSL "https://github.com/0xERR0R/blocky/releases/download/v${RELEASE}/blocky_v${RELEASE}_Linux_x86_64.tar.gz" | tar -xzf - -C /opt/blocky/ - cat </opt/blocky/config.yml # configuration documentation: https://0xerr0r.github.io/blocky/latest/configuration/ @@ -63,7 +61,7 @@ log: # optional: Log level (one from trace, debug, info, warn, error). Default: info level: info EOF -msg_ok "Installed Blocky" +msg_ok "Configured Blocky" msg_info "Creating Service" cat </etc/systemd/system/blocky.service @@ -77,7 +75,7 @@ ExecStart=/opt/blocky/./blocky --config config.yml [Install] WantedBy=multi-user.target EOF -$STD systemctl enable --now blocky +$STD systemctl enable -q --now blocky msg_ok "Created Service" motd_ssh