mirror of
https://github.com/community-scripts/ProxmoxVE.git
synced 2026-02-26 23:15:55 +01:00
b439960222
* fix: send telemetry BEFORE log collection in signal handlers - Swap ensure_log_on_host/post_update_to_api order in on_interrupt, on_terminate, api_exit_script, and inline SIGHUP/SIGINT/SIGTERM traps - For signal exits (>128): send telemetry immediately, then best-effort log collection - Add 2>/dev/null || true to all I/O in signal handlers to prevent SIGPIPE - Fix on_exit: exit_code=0 now reports 'done' instead of 'failed 1' - Root cause: pct pull hangs on dying containers blocked telemetry updates, leaving 595+ records stuck in 'installing' daily * feat: add execution_id to all telemetry payloads - Generate EXECUTION_ID from RANDOM_UUID in variables() - Export EXECUTION_ID to container environment - Add execution_id field to all 8 API payloads in api.func - Add execution_id to post_progress_to_api in install.func and alpine-install.func - Fallback to RANDOM_UUID when EXECUTION_ID not set (backward compat) * fix: correct telemetry type values for PVE and addon scripts - PVE scripts (tools/pve/*): change type 'tool' -> 'pve' - Addon scripts (tools/addon/*): fix 4 scripts that wrongly used 'tool' -> 'addon' (netdata, add-tailscale-lxc, add-netbird-lxc, all-templates) - api.func: post_tool_to_api sends type='pve', default fallback 'pve' - Aligns with PocketBase categories: lxc, vm, pve, addon * fix: persist diagnostics opt-in inside containers for addon telemetry - install.func + alpine-install.func: create /usr/local/community-scripts/diagnostics inside the container when DIAGNOSTICS=yes (from build.func export) - Enables addon scripts running later inside containers to find the opt-in - Update init_tool_telemetry default type from 'tool' to 'pve' * refactor: clean up diagnostics/telemetry opt-in system - diagnostics_check(): deduplicate heredoc (was 2x 22 lines), improve whiptail text with clear what/what-not collected, add telemetry + privacy links - diagnostics_menu(): better UX with current status, clear enable/disable buttons, note about existing containers - variables(): change DIAGNOSTICS default from 'yes' to 'no' (safe: no telemetry before user consents via diagnostics_check) - install.func + alpine-install.func: persist BOTH yes AND no in container so opt-out is explicit (not just missing file = no) - Fix typo 'menue' -> 'menu' in config file comments * fix: no pre-selection in telemetry dialog, link to telemetry-service README - Add --defaultno so 'No, opt out' is focused by default (user must Tab to Yes) - Change privacy link from discussions/1836 to telemetry-service#privacy--compliance * fix: use radiolist for telemetry dialog (no pre-selection) - Replace --yesno with --radiolist: user must actively SPACE-select an option - Both options start as OFF (no pre-selection) - Cancel/Exit defaults to 'no' (opt-out) * simplify: inline telemetry dialog text like other whiptail dialogs * improve: telemetry dialog with more detail, link to PRIVACY.md - Add what we collect / don't collect sections back to dialog - Link to telemetry-service/docs/PRIVACY.md instead of README anchor - Update config file comment with same link
109 lines
3.4 KiB
Bash
109 lines
3.4 KiB
Bash
#!/usr/bin/env bash
|
|
|
|
# Copyright (c) 2021-2026 tteck
|
|
# Author: tteck (tteckster)
|
|
# Co-Author: MickLesk (Canbiz)
|
|
# License: MIT
|
|
# https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
|
|
|
|
function header_info {
|
|
clear
|
|
cat <<"EOF"
|
|
_ __ __ ____ _ __
|
|
/ | / /__ / /_/ __ )(_)________/ /
|
|
/ |/ / _ \/ __/ __ / / ___/ __ /
|
|
/ /| / __/ /_/ /_/ / / / / /_/ /
|
|
/_/ |_/\___/\__/_____/_/_/ \__,_/
|
|
|
|
EOF
|
|
}
|
|
header_info
|
|
set -e
|
|
|
|
# Telemetry
|
|
source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
|
|
declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "add-netbird-lxc" "addon"
|
|
|
|
while true; do
|
|
read -p "This will add NetBird to an existing LXC Container ONLY. Proceed(y/n)?" yn
|
|
case $yn in
|
|
[Yy]*) break ;;
|
|
[Nn]*) exit ;;
|
|
*) echo "Please answer yes or no." ;;
|
|
esac
|
|
done
|
|
header_info
|
|
echo "Loading..."
|
|
|
|
function msg() {
|
|
local TEXT="$1"
|
|
echo -e "$TEXT"
|
|
}
|
|
|
|
NODE=$(hostname)
|
|
MSG_MAX_LENGTH=0
|
|
while read -r line; do
|
|
TAG=$(echo "$line" | awk '{print $1}')
|
|
ITEM=$(echo "$line" | awk '{print substr($0,36)}')
|
|
OFFSET=2
|
|
if [[ $((${#ITEM} + $OFFSET)) -gt ${MSG_MAX_LENGTH:-} ]]; then
|
|
MSG_MAX_LENGTH=$((${#ITEM} + $OFFSET))
|
|
fi
|
|
CTID_MENU+=("$TAG" "$ITEM " "OFF")
|
|
done < <(pct list | awk 'NR>1')
|
|
|
|
while [ -z "${CTID:+x}" ]; do
|
|
CTID=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "Containers on $NODE" --radiolist \
|
|
"\nSelect a container to add NetBird to:\n" \
|
|
16 $(($MSG_MAX_LENGTH + 23)) 6 \
|
|
"${CTID_MENU[@]}" 3>&1 1>&2 2>&3)
|
|
done
|
|
|
|
LXC_STATUS=$(pct status "$CTID" | awk '{print $2}')
|
|
if [[ "$LXC_STATUS" != "running" ]]; then
|
|
msg "\e[1;33m The container $CTID is not running. Starting it now...\e[0m"
|
|
pct start "$CTID"
|
|
while [[ "$(pct status "$CTID" | awk '{print $2}')" != "running" ]]; do
|
|
msg "\e[1;33m Waiting for the container to start...\e[0m"
|
|
sleep 2
|
|
done
|
|
msg "\e[1;32m Container $CTID is now running.\e[0m"
|
|
fi
|
|
|
|
DISTRO=$(pct exec "$CTID" -- cat /etc/os-release | grep -w "ID" | cut -d'=' -f2 | tr -d '"')
|
|
if [[ "$DISTRO" != "debian" && "$DISTRO" != "ubuntu" ]]; then
|
|
msg "\e[1;31m Error: This script only supports Debian or Ubuntu LXC containers. Detected: $DISTRO. Aborting...\e[0m"
|
|
exit 1
|
|
fi
|
|
|
|
CTID_CONFIG_PATH=/etc/pve/lxc/${CTID}.conf
|
|
cat <<EOF >>$CTID_CONFIG_PATH
|
|
lxc.cgroup2.devices.allow: c 10:200 rwm
|
|
lxc.mount.entry: /dev/net/tun dev/net/tun none bind,create=file
|
|
EOF
|
|
header_info
|
|
msg "Installing NetBird..."
|
|
pct exec "$CTID" -- bash -c '
|
|
if ! command -v curl &>/dev/null; then
|
|
apt-get update -qq
|
|
apt-get install -y curl >/dev/null
|
|
fi
|
|
apt install -y ca-certificates gpg &>/dev/null
|
|
curl -fsSL "https://pkgs.netbird.io/debian/public.key" | gpg --dearmor >/usr/share/keyrings/netbird-archive-keyring.gpg
|
|
echo "deb [signed-by=/usr/share/keyrings/netbird-archive-keyring.gpg] https://pkgs.netbird.io/debian stable main" >/etc/apt/sources.list.d/netbird.list
|
|
apt-get update &>/dev/null
|
|
apt-get install -y netbird-ui &>/dev/null
|
|
if systemctl list-unit-files docker.service &>/dev/null; then
|
|
mkdir -p /etc/systemd/system/netbird.service.d
|
|
cat <<OVERRIDE >/etc/systemd/system/netbird.service.d/after-docker.conf
|
|
[Unit]
|
|
After=docker.service
|
|
Wants=docker.service
|
|
OVERRIDE
|
|
systemctl daemon-reload
|
|
fi
|
|
'
|
|
msg "\e[1;32m ✔ Installed NetBird.\e[0m"
|
|
sleep 2
|
|
msg "\e[1;31m Reboot ${CTID} LXC to apply the changes, then run netbird up in the LXC console\e[0m"
|