diff --git a/ct/ntfy.sh b/ct/ntfy.sh index 3a21849eb..6dfb2c844 100644 --- a/ct/ntfy.sh +++ b/ct/ntfy.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func) -# Copyright (c) 2021-2025 tteck -# Author: tteck (tteckster) +# Copyright (c) 2021-2025 community-scripts ORG +# Author: CrazyWolf13 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE # Source: https://ntfy.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" @@ -23,13 +23,31 @@ function update_script() { header_info check_container_storage check_container_resources - if [[ ! -d /var ]]; then + if [[ ! -d /etc/ntfy ]]; then msg_error "No ${APP} Installation Found!" exit fi + + if [ -f /etc/apt/keyrings/archive.heckel.io.gpg ]; then + msg_info "Correcting old Ntfy Repository" + rm -f /etc/apt/keyrings/archive.heckel.io.gpg + rm -f /etc/apt/sources.list.d/archive.heckel.io.list + rm -f /etc/apt/sources.list.d/archive.heckel.io.list.bak + rm -f /etc/apt/sources.list.d/archive.heckel.io.sources + curl -fsSL -o /etc/apt/keyrings/ntfy.gpg https://archive.ntfy.sh/apt/keyring.gpg + cat <<'EOF' >/etc/apt/sources.list.d/ntfy.sources +Types: deb +URIs: https://archive.ntfy.sh/apt/ +Suites: stable +Components: main +Signed-By: /etc/apt/keyrings/ntfy.gpg +EOF + msg_ok "Corrected old Ntfy Repository" + fi + msg_info "Updating $APP LXC" - $STD apt-get update - $STD apt-get -y upgrade + $STD apt update + $STD apt -y upgrade msg_ok "Updated $APP LXC" exit } @@ -41,4 +59,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}${CL}" \ No newline at end of file +echo -e "${TAB}${GATEWAY}${BGN}http://${IP}${CL}" diff --git a/frontend/public/json/ntfy.json b/frontend/public/json/ntfy.json index fbcecd86c..28d37388f 100644 --- a/frontend/public/json/ntfy.json +++ b/frontend/public/json/ntfy.json @@ -23,7 +23,7 @@ "ram": 512, "hdd": 2, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/install/ntfy-install.sh b/install/ntfy-install.sh index eb662f9b1..d8c6baee1 100644 --- a/install/ntfy-install.sh +++ b/install/ntfy-install.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash -# Copyright (c) 2021-2025 tteck -# Author: tteck (tteckster) +# Copyright (c) 2021-2025 community-scripts ORG +# Author: CrazyWolf13 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE # Source: https://ntfy.sh/ @@ -13,17 +13,19 @@ setting_up_container network_check update_os -msg_info "Installing Dependencies" -$STD apt-get install -y \ - apt-transport-https -msg_ok "Installed Dependencies" - msg_info "Installing ntfy" mkdir -p /etc/apt/keyrings -curl -fsSL https://archive.heckel.io/apt/pubkey.txt | gpg --dearmor -o /etc/apt/keyrings/archive.heckel.io.gpg -echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/archive.heckel.io.gpg] https://archive.heckel.io/apt debian main" >/etc/apt/sources.list.d/archive.heckel.io.list -$STD apt-get update -$STD apt-get install -y ntfy +curl -fsSL -o /etc/apt/keyrings/ntfy.gpg https://archive.ntfy.sh/apt/keyring.gpg +cat </etc/apt/sources.list.d/ntfy.sources +Types: deb +URIs: https://archive.ntfy.sh/apt/ +Suites: stable +Components: main +Signed-By: /etc/apt/keyrings/ntfy.gpg +EOF + +$STD apt update +$STD apt install -y ntfy systemctl enable -q --now ntfy msg_ok "Installed ntfy" @@ -31,6 +33,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"