mirror of
https://github.com/community-scripts/ProxmoxVE.git
synced 2026-03-20 08:52:59 +01:00
Compare commits
10 Commits
tremor021-
...
refactor/t
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dbf3fa6f1d | ||
|
|
876d14721d | ||
|
|
8c452e855b | ||
|
|
24ce6e006b | ||
|
|
84c7647841 | ||
|
|
24429475f8 | ||
|
|
32127096e5 | ||
|
|
923fbf96d8 | ||
|
|
1ce0af9455 | ||
|
|
8879b8ec2e |
@@ -427,8 +427,12 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
|
|||||||
|
|
||||||
### 🚀 Updated Scripts
|
### 🚀 Updated Scripts
|
||||||
|
|
||||||
|
- Owncast: increase default disk size from 2GB to 10GB [@Copilot](https://github.com/Copilot) ([#13079](https://github.com/community-scripts/ProxmoxVE/pull/13079))
|
||||||
|
|
||||||
- #### 🐞 Bug Fixes
|
- #### 🐞 Bug Fixes
|
||||||
|
|
||||||
|
- Increase Tracearr RAM; derive APP_VERSION [@MickLesk](https://github.com/MickLesk) ([#13087](https://github.com/community-scripts/ProxmoxVE/pull/13087))
|
||||||
|
- ProjectSend: Update application access URL [@tremor021](https://github.com/tremor021) ([#13078](https://github.com/community-scripts/ProxmoxVE/pull/13078))
|
||||||
- Dispatcharr: use npm install --no-audit --progress=false [@MickLesk](https://github.com/MickLesk) ([#13074](https://github.com/community-scripts/ProxmoxVE/pull/13074))
|
- Dispatcharr: use npm install --no-audit --progress=false [@MickLesk](https://github.com/MickLesk) ([#13074](https://github.com/community-scripts/ProxmoxVE/pull/13074))
|
||||||
- core: reorder hwaccel setup and adjust GPU group usermod [@MickLesk](https://github.com/MickLesk) ([#13072](https://github.com/community-scripts/ProxmoxVE/pull/13072))
|
- core: reorder hwaccel setup and adjust GPU group usermod [@MickLesk](https://github.com/MickLesk) ([#13072](https://github.com/community-scripts/ProxmoxVE/pull/13072))
|
||||||
|
|
||||||
|
|||||||
@@ -110,6 +110,8 @@ function update_script() {
|
|||||||
|
|
||||||
msg_info "Building Frontend"
|
msg_info "Building Frontend"
|
||||||
cd /opt/dispatcharr/frontend
|
cd /opt/dispatcharr/frontend
|
||||||
|
node -e "const p=require('./package.json');p.overrides=p.overrides||{};p.overrides['webworkify-webpack']='2.1.3';require('fs').writeFileSync('package.json',JSON.stringify(p,null,2));"
|
||||||
|
rm -f package-lock.json
|
||||||
$STD npm install --no-audit --progress=false
|
$STD npm install --no-audit --progress=false
|
||||||
$STD npm run build
|
$STD npm run build
|
||||||
msg_ok "Built Frontend"
|
msg_ok "Built Frontend"
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ APP="Owncast"
|
|||||||
var_tags="${var_tags:-broadcasting}"
|
var_tags="${var_tags:-broadcasting}"
|
||||||
var_cpu="${var_cpu:-2}"
|
var_cpu="${var_cpu:-2}"
|
||||||
var_ram="${var_ram:-2048}"
|
var_ram="${var_ram:-2048}"
|
||||||
var_disk="${var_disk:-2}"
|
var_disk="${var_disk:-10}"
|
||||||
var_os="${var_os:-debian}"
|
var_os="${var_os:-debian}"
|
||||||
var_version="${var_version:-13}"
|
var_version="${var_version:-13}"
|
||||||
var_unprivileged="${var_unprivileged:-1}"
|
var_unprivileged="${var_unprivileged:-1}"
|
||||||
|
|||||||
@@ -60,4 +60,4 @@ description
|
|||||||
msg_ok "Completed successfully!\n"
|
msg_ok "Completed successfully!\n"
|
||||||
echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
|
echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
|
||||||
echo -e "${INFO}${YW} Access it using the following URL:${CL}"
|
echo -e "${INFO}${YW} Access it using the following URL:${CL}"
|
||||||
echo -e "${TAB}${GATEWAY}${BGN}http://${IP}${CL}"
|
echo -e "${TAB}${GATEWAY}${BGN}http://${IP}/install for the initial setup${CL}"
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxV
|
|||||||
APP="Tracearr"
|
APP="Tracearr"
|
||||||
var_tags="${var_tags:-media}"
|
var_tags="${var_tags:-media}"
|
||||||
var_cpu="${var_cpu:-2}"
|
var_cpu="${var_cpu:-2}"
|
||||||
var_ram="${var_ram:-2048}"
|
var_ram="${var_ram:-4096}"
|
||||||
var_disk="${var_disk:-10}"
|
var_disk="${var_disk:-10}"
|
||||||
var_os="${var_os:-debian}"
|
var_os="${var_os:-debian}"
|
||||||
var_version="${var_version:-13}"
|
var_version="${var_version:-13}"
|
||||||
@@ -140,7 +140,7 @@ EOF
|
|||||||
msg_ok "Built Tracearr"
|
msg_ok "Built Tracearr"
|
||||||
|
|
||||||
msg_info "Configuring Tracearr"
|
msg_info "Configuring Tracearr"
|
||||||
sed -i "s/^APP_VERSION=.*/APP_VERSION=$(cat /root/.tracearr)/" /data/tracearr/.env
|
sed -i "s|^APP_VERSION=.*|APP_VERSION=${CHECK_UPDATE_RELEASE#v}|" /data/tracearr/.env
|
||||||
chmod 600 /data/tracearr/.env
|
chmod 600 /data/tracearr/.env
|
||||||
chown -R tracearr:tracearr /data/tracearr
|
chown -R tracearr:tracearr /data/tracearr
|
||||||
mkdir -p /data/backup
|
mkdir -p /data/backup
|
||||||
|
|||||||
@@ -66,6 +66,8 @@ CELERY_BROKER_URL=redis://localhost:6379/0
|
|||||||
DJANGO_SECRET_KEY=$DJANGO_SECRET
|
DJANGO_SECRET_KEY=$DJANGO_SECRET
|
||||||
EOF
|
EOF
|
||||||
cd /opt/dispatcharr/frontend
|
cd /opt/dispatcharr/frontend
|
||||||
|
node -e "const p=require('./package.json');p.overrides=p.overrides||{};p.overrides['webworkify-webpack']='2.1.3';require('fs').writeFileSync('package.json',JSON.stringify(p,null,2));"
|
||||||
|
rm -f package-lock.json
|
||||||
$STD npm install --no-audit --progress=false
|
$STD npm install --no-audit --progress=false
|
||||||
$STD npm run build
|
$STD npm run build
|
||||||
msg_ok "Configured Dispatcharr"
|
msg_ok "Configured Dispatcharr"
|
||||||
|
|||||||
@@ -282,7 +282,7 @@ get_cached_version() {
|
|||||||
cat "/var/cache/app-versions/${app}_version.txt"
|
cat "/var/cache/app-versions/${app}_version.txt"
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
return 0
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
@@ -1100,8 +1100,9 @@ get_system_arch() {
|
|||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
create_temp_dir() {
|
create_temp_dir() {
|
||||||
local tmp_dir=$(mktemp -d)
|
local tmp_dir=$(mktemp -d)
|
||||||
# Set trap to cleanup on EXIT, ERR, INT, TERM
|
# Callers should handle their own cleanup (rm -rf "$tmpdir")
|
||||||
trap "rm -rf '$tmp_dir'" EXIT ERR INT TERM
|
# Do NOT set trap here — it would overwrite global traps and only fire
|
||||||
|
# when create_temp_dir() itself returns, not the calling function
|
||||||
echo "$tmp_dir"
|
echo "$tmp_dir"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -5351,26 +5352,9 @@ function setup_java() {
|
|||||||
"main"
|
"main"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Get currently installed version
|
# Get currently installed version (use dpkg-query to avoid column truncation)
|
||||||
local INSTALLED_VERSION=""
|
local INSTALLED_VERSION=""
|
||||||
if dpkg -l | grep -q "temurin-.*-jdk" 2>/dev/null; then
|
INSTALLED_VERSION=$(dpkg-query -W -f '${Package}\n' 2>/dev/null | grep -oP '^temurin-\K[0-9]+(?=-jdk$)' | head -n1 || echo "")
|
||||||
INSTALLED_VERSION=$(dpkg -l 2>/dev/null | awk '/temurin-.*-jdk/{print $2}' | grep -oP 'temurin-\K[0-9]+' | head -n1 || echo "")
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Validate INSTALLED_VERSION is not empty if JDK package found
|
|
||||||
local JDK_COUNT=0
|
|
||||||
JDK_COUNT=$(dpkg -l 2>/dev/null | grep -c "temurin-.*-jdk" || true)
|
|
||||||
if [[ -z "$INSTALLED_VERSION" && "${JDK_COUNT:-0}" -gt 0 ]]; then
|
|
||||||
msg_warn "Found Temurin JDK but cannot determine version - attempting reinstall"
|
|
||||||
# Try to get actual package name for purge
|
|
||||||
local OLD_PACKAGE
|
|
||||||
OLD_PACKAGE=$(dpkg -l 2>/dev/null | awk '/temurin-.*-jdk/{print $2}' | head -n1 || echo "")
|
|
||||||
if [[ -n "$OLD_PACKAGE" ]]; then
|
|
||||||
msg_info "Removing existing package: $OLD_PACKAGE"
|
|
||||||
$STD apt purge -y "$OLD_PACKAGE" || true
|
|
||||||
fi
|
|
||||||
INSTALLED_VERSION="" # Reset to trigger fresh install
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Scenario 1: Already at correct version
|
# Scenario 1: Already at correct version
|
||||||
if [[ "$INSTALLED_VERSION" == "$JAVA_VERSION" ]]; then
|
if [[ "$INSTALLED_VERSION" == "$JAVA_VERSION" ]]; then
|
||||||
@@ -7849,8 +7833,8 @@ function setup_uv() {
|
|||||||
local TMP_DIR=$(mktemp -d)
|
local TMP_DIR=$(mktemp -d)
|
||||||
local CACHED_VERSION
|
local CACHED_VERSION
|
||||||
|
|
||||||
# trap for TMP Cleanup
|
# trap for TMP Cleanup (RETURN instead of EXIT to avoid overwriting global traps)
|
||||||
trap "rm -rf '$TMP_DIR'" EXIT
|
trap "rm -rf '$TMP_DIR'" RETURN
|
||||||
|
|
||||||
CACHED_VERSION=$(get_cached_version "uv")
|
CACHED_VERSION=$(get_cached_version "uv")
|
||||||
|
|
||||||
@@ -8120,6 +8104,8 @@ function setup_docker() {
|
|||||||
local docker_installed=false
|
local docker_installed=false
|
||||||
local portainer_installed=false
|
local portainer_installed=false
|
||||||
local USE_DOCKER_REPO="${USE_DOCKER_REPO:-false}"
|
local USE_DOCKER_REPO="${USE_DOCKER_REPO:-false}"
|
||||||
|
local DOCKER_CURRENT_VERSION=""
|
||||||
|
local DOCKER_LATEST_VERSION=""
|
||||||
|
|
||||||
# Check if Docker is already installed
|
# Check if Docker is already installed
|
||||||
if command -v docker &>/dev/null; then
|
if command -v docker &>/dev/null; then
|
||||||
|
|||||||
Reference in New Issue
Block a user