mirror of
https://github.com/community-scripts/ProxmoxVE.git
synced 2026-08-24 16:41:52 +02:00
Compare commits
14
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ba64d133f3 | ||
|
|
4c6ccdde35 | ||
|
|
8f407870b9 | ||
|
|
a876ad22bb | ||
|
|
9d719d18d2 | ||
|
|
3c56af9f33 | ||
|
|
e9744fa681 | ||
|
|
d1dd9e18e4 | ||
|
|
7cc090d508 | ||
|
|
566c203a34 | ||
|
|
803fbfdd9f | ||
|
|
19bfe87e0e | ||
|
|
c8c5b91ec4 | ||
|
|
065f34aefe |
Generated
+32
@@ -35,3 +35,35 @@ Fixes #
|
||||
- [ ] 🌍 **Website update** – Changes to script metadata (PocketBase/website data).
|
||||
- [ ] 🔧 **Refactoring / Code Cleanup** – Improves readability or maintainability without changing functionality.
|
||||
- [ ] 📝 **Documentation update** – Changes to `README`, `AppName.md`, `CONTRIBUTING.md`, or other docs.
|
||||
|
||||
---
|
||||
|
||||
## 💥 Breaking Change Advisory (only if you checked "Breaking change")
|
||||
|
||||
If this PR changes existing behaviour in a way that may require action before an
|
||||
update, add a `breaking-change` advisory block to this PR body. The website and
|
||||
the in-container update guard read it to tell operators exactly what to expect,
|
||||
what to do first, and — with `action: block` — to stop an update until it's
|
||||
handled. Every field is optional; the advisory auto-expires 30 days after merge.
|
||||
|
||||
Copy the block out of the comment below, fill it in, and paste it here:
|
||||
|
||||
<!--
|
||||
```breaking-change
|
||||
severity: warning # info | warning | critical
|
||||
action: warn # warn (default) | block — "block" halts the update until an operator forces it
|
||||
expect: One line describing what changes and why it may need action.
|
||||
before_update:
|
||||
- First thing to do before updating
|
||||
- Second thing to do before updating
|
||||
```
|
||||
|
||||
Guidance:
|
||||
- Leave this commented (or delete it) for a routine change — no block, no advisory.
|
||||
- Use `action: block` only for changes that break or lose data if the operator
|
||||
updates without acting first (e.g. a required manual migration or backup).
|
||||
- `expect:` supersedes the auto-scraped summary; keep it to one line.
|
||||
- Steps render as a checklist on the site and in the update prompt.
|
||||
-->
|
||||
|
||||
<!-- The advisory block is only active once it is OUTSIDE this comment. -->
|
||||
|
||||
+58
@@ -0,0 +1,58 @@
|
||||
name: Notify breaking change
|
||||
|
||||
# When a PR labelled "breaking change" is merged, tell the Helper-Scripts site
|
||||
# so it can show a temporary advisory on the affected scripts. The site pulls
|
||||
# the PR itself and re-verifies it is merged + labelled, so this workflow only
|
||||
# has to hand over the PR number.
|
||||
#
|
||||
# Requires one repo secret:
|
||||
# BREAKING_CHANGE_INGEST_SECRET — must match the value the site runs with.
|
||||
# Site URL is taken from the existing FRONTEND_URL secret, then an optional
|
||||
# SITE_URL variable, then a hard default.
|
||||
#
|
||||
# pull_request_target (not pull_request) so the run has access to the secret
|
||||
# even for fork PRs. It is safe here: the job never checks out or runs PR code —
|
||||
# it only forwards the number after the PR has merged.
|
||||
|
||||
on:
|
||||
pull_request_target:
|
||||
# closed -> fires on the merge itself
|
||||
# labeled -> fires if the label is added to an already-merged PR
|
||||
types: [closed, labeled]
|
||||
|
||||
concurrency:
|
||||
group: notify-breaking-change-${{ github.event.pull_request.number }}
|
||||
cancel-in-progress: false
|
||||
|
||||
jobs:
|
||||
notify:
|
||||
if: >-
|
||||
github.event.pull_request.merged == true &&
|
||||
contains(github.event.pull_request.labels.*.name, 'breaking change')
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Notify site of breaking change
|
||||
env:
|
||||
INGEST_SECRET: ${{ secrets.BREAKING_CHANGE_INGEST_SECRET }}
|
||||
SITE_URL: ${{ secrets.FRONTEND_URL || vars.SITE_URL || 'https://community-scripts.org' }}
|
||||
PR: ${{ github.event.pull_request.number }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
if [ -z "${INGEST_SECRET:-}" ]; then
|
||||
echo "::error::BREAKING_CHANGE_INGEST_SECRET secret is not set."
|
||||
exit 1
|
||||
fi
|
||||
url="${SITE_URL%/}/api/breaking-changes/ingest"
|
||||
echo "Notifying $url for PR #${PR}"
|
||||
status="$(curl -sS -o response.json -w '%{http_code}' \
|
||||
-X POST "$url" \
|
||||
-H "Authorization: Bearer ${INGEST_SECRET}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "{\"pr\": ${PR}}")"
|
||||
echo "HTTP $status"
|
||||
cat response.json || true
|
||||
echo
|
||||
if [ "$status" != "200" ]; then
|
||||
echo "::error::ingest endpoint returned HTTP $status"
|
||||
exit 1
|
||||
fi
|
||||
@@ -527,6 +527,23 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
|
||||
|
||||
</details>
|
||||
|
||||
## 2026-08-24
|
||||
|
||||
### 🚀 Updated Scripts
|
||||
|
||||
- #### 🐞 Bug Fixes
|
||||
|
||||
- fireshare: source fireshare.env during update [@MickLesk](https://github.com/MickLesk) ([#16706](https://github.com/community-scripts/ProxmoxVE/pull/16706))
|
||||
- netbox: serve on plain HTTP too, port 80 forced HTTPS redirect broke reverse proxies [@MickLesk](https://github.com/MickLesk) ([#16707](https://github.com/community-scripts/ProxmoxVE/pull/16707))
|
||||
- FileFlows: Fix Download URL [@MickLesk](https://github.com/MickLesk) ([#16708](https://github.com/community-scripts/ProxmoxVE/pull/16708))
|
||||
- Gitea: fix git-over-SSH auth, group-writable home dir tripped sshd StrictModes [@MickLesk](https://github.com/MickLesk) ([#16710](https://github.com/community-scripts/ProxmoxVE/pull/16710))
|
||||
|
||||
### 🧰 Tools
|
||||
|
||||
- #### 🐞 Bug Fixes
|
||||
|
||||
- post-pve/pbs-install: fix component_exists_in_sources matching substrings of hyphenated tokens [@MickLesk](https://github.com/MickLesk) ([#16709](https://github.com/community-scripts/ProxmoxVE/pull/16709))
|
||||
|
||||
## 2026-08-23
|
||||
|
||||
### 🚀 Updated Scripts
|
||||
|
||||
+1
-1
@@ -101,7 +101,7 @@ function update_script() {
|
||||
fi
|
||||
msg_ok "Ensured ASP.NET Core Runtime"
|
||||
|
||||
fetch_and_deploy_from_url "https://fileflows.com/downloads/zip" "/opt/fileflows"
|
||||
fetch_and_deploy_from_url "https://fileflows.com/downloads/ff-latest.tar.xz" "/opt/fileflows"
|
||||
|
||||
msg_info "Starting Service"
|
||||
systemctl --all start 'fileflows*'
|
||||
|
||||
+3
-5
@@ -57,11 +57,9 @@ function update_script() {
|
||||
$STD .venv/bin/python -m pip install --upgrade --break-system-packages pip
|
||||
$STD .venv/bin/python -m pip install --no-cache-dir --break-system-packages --ignore-installed app/server
|
||||
cp .venv/bin/fireshare /usr/local/bin/fireshare
|
||||
export FLASK_APP="/opt/fireshare/app/server/fireshare:create_app()"
|
||||
export DATA_DIRECTORY=/opt/fireshare-data
|
||||
export IMAGE_DIRECTORY=/opt/fireshare-images
|
||||
export VIDEO_DIRECTORY=/opt/fireshare-videos
|
||||
export PROCESSED_DIRECTORY=/opt/fireshare-processed
|
||||
set -a
|
||||
source /opt/fireshare/fireshare.env
|
||||
set +a
|
||||
$STD uv run flask db upgrade
|
||||
cd /opt/fireshare/app/client
|
||||
$STD npm install
|
||||
|
||||
@@ -39,7 +39,7 @@ else
|
||||
fi
|
||||
msg_ok "Installed ASP.NET Core Runtime"
|
||||
|
||||
fetch_and_deploy_from_url "https://fileflows.com/downloads/zip" "/opt/fileflows"
|
||||
fetch_and_deploy_from_url "https://fileflows.com/downloads/ff-latest.tar.xz" "/opt/fileflows"
|
||||
|
||||
$STD ln -svf /usr/bin/ffmpeg /usr/local/bin/ffmpeg
|
||||
$STD ln -svf /usr/bin/ffprobe /usr/local/bin/ffprobe
|
||||
|
||||
@@ -30,7 +30,7 @@ setup_deb_based() {
|
||||
chown -R gitea:gitea /var/lib/gitea/
|
||||
chmod -R 750 /var/lib/gitea/
|
||||
chown root:gitea /etc/gitea
|
||||
chmod 770 /etc/gitea
|
||||
chmod 750 /etc/gitea
|
||||
sudo -u gitea ln -s /var/lib/gitea/data/.ssh/ /etc/gitea/.ssh
|
||||
msg_ok "Configured Gitea"
|
||||
|
||||
|
||||
@@ -59,8 +59,52 @@ sed -i -e 's/ALLOWED_HOSTS = \[\]/ALLOWED_HOSTS = ["*"]/' \
|
||||
$STD /opt/netbox/upgrade.sh
|
||||
ln -s /opt/netbox/contrib/netbox-housekeeping.sh /etc/cron.daily/netbox-housekeeping
|
||||
|
||||
mv /opt/netbox/contrib/apache.conf /etc/apache2/sites-available/netbox.conf
|
||||
$STD openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private/netbox.key -out /etc/ssl/certs/netbox.crt -subj "/C=US/O=NetBox/OU=Certificate/CN=localhost"
|
||||
cat <<EOF >/etc/apache2/sites-available/netbox.conf
|
||||
<VirtualHost *:80>
|
||||
ProxyPreserveHost On
|
||||
|
||||
Alias /static /opt/netbox/netbox/static
|
||||
|
||||
<Directory /opt/netbox/netbox/static>
|
||||
Options FollowSymLinks MultiViews
|
||||
AllowOverride None
|
||||
Require all granted
|
||||
</Directory>
|
||||
|
||||
<Location /static>
|
||||
ProxyPass !
|
||||
</Location>
|
||||
|
||||
RequestHeader set "X-Forwarded-Proto" expr=%{REQUEST_SCHEME}
|
||||
ProxyPass / http://127.0.0.1:8001/
|
||||
ProxyPassReverse / http://127.0.0.1:8001/
|
||||
</VirtualHost>
|
||||
|
||||
<VirtualHost *:443>
|
||||
ProxyPreserveHost On
|
||||
|
||||
SSLEngine on
|
||||
SSLCertificateFile /etc/ssl/certs/netbox.crt
|
||||
SSLCertificateKeyFile /etc/ssl/private/netbox.key
|
||||
|
||||
Alias /static /opt/netbox/netbox/static
|
||||
|
||||
<Directory /opt/netbox/netbox/static>
|
||||
Options FollowSymLinks MultiViews
|
||||
AllowOverride None
|
||||
Require all granted
|
||||
</Directory>
|
||||
|
||||
<Location /static>
|
||||
ProxyPass !
|
||||
</Location>
|
||||
|
||||
RequestHeader set "X-Forwarded-Proto" expr=%{REQUEST_SCHEME}
|
||||
ProxyPass / http://127.0.0.1:8001/
|
||||
ProxyPassReverse / http://127.0.0.1:8001/
|
||||
</VirtualHost>
|
||||
EOF
|
||||
$STD a2enmod ssl proxy proxy_http headers rewrite
|
||||
$STD a2ensite netbox
|
||||
systemctl restart apache2
|
||||
|
||||
+22
-3
@@ -1208,10 +1208,12 @@ base_settings() {
|
||||
# - Used by default_var_settings and app defaults loading
|
||||
# - Only loads whitelisted var_* keys
|
||||
# - Optional force parameter to override existing values (for app defaults)
|
||||
# - Optional protected list preserves genuinely user-exported var_* values
|
||||
# ------------------------------------------------------------------------------
|
||||
load_vars_file() {
|
||||
local file="$1"
|
||||
local force="${2:-no}" # If "yes", override existing variables
|
||||
local force="${2:-no}" # If "yes", override existing variables
|
||||
local protected="${3:-}" # space-separated var_* keys the user genuinely exported before this file loaded; never overwritten
|
||||
[ -f "$file" ] || return 0
|
||||
msg_info "Loading defaults from ${file}"
|
||||
|
||||
@@ -1231,6 +1233,13 @@ load_vars_file() {
|
||||
return 1
|
||||
}
|
||||
|
||||
# Protected check helper (genuinely user-exported vars, see $protected above)
|
||||
_is_protected() {
|
||||
local k="$1" p
|
||||
for p in $protected; do [ "$k" = "$p" ] && return 0; done
|
||||
return 1
|
||||
}
|
||||
|
||||
local line key val
|
||||
while IFS= read -r line || [ -n "$line" ]; do
|
||||
line="${line#"${line%%[![:space:]]*}"}"
|
||||
@@ -1435,9 +1444,19 @@ load_vars_file() {
|
||||
esac
|
||||
fi
|
||||
|
||||
# Set variable: force mode overrides existing, otherwise only set if empty
|
||||
# Set variable: force mode overrides existing, otherwise only set if empty.
|
||||
# Exception: var_cpu/var_ram/var_disk are always applied here (unless the
|
||||
# user genuinely exported them beforehand, per $protected) even though the
|
||||
# app script already declared its own baseline for them - base_settings()
|
||||
# reconciles the final floor against APP_DEFAULT_* afterward, so this file
|
||||
# must be allowed to raise them instead of being silently blocked by the
|
||||
# app's own pre-set value.
|
||||
if [[ "$force" == "yes" ]]; then
|
||||
export "${var_key}=${var_val}"
|
||||
elif _is_protected "$var_key"; then
|
||||
:
|
||||
elif [[ "$var_key" == "var_cpu" || "$var_key" == "var_ram" || "$var_key" == "var_disk" ]]; then
|
||||
export "${var_key}=${var_val}"
|
||||
else
|
||||
[[ -z "${!var_key+x}" ]] && export "${var_key}=${var_val}"
|
||||
fi
|
||||
@@ -1597,7 +1616,7 @@ EOF
|
||||
msg_error "default.vars not found after ensure step"
|
||||
return 252
|
||||
}
|
||||
load_vars_file "$dv"
|
||||
load_vars_file "$dv" "no" "${!_HARD_ENV[*]}"
|
||||
|
||||
# 3) Map var_verbose → VERBOSE
|
||||
if [[ -n "${var_verbose:-}" ]]; then
|
||||
|
||||
@@ -62,7 +62,14 @@ repo_state_list() {
|
||||
|
||||
component_exists_in_sources() {
|
||||
local component="$1"
|
||||
grep -h -E "^[^#]*Components:[^#]*\b${component}\b" /etc/apt/sources.list.d/*.sources 2>/dev/null | grep -q .
|
||||
local line comp
|
||||
while IFS= read -r line; do
|
||||
line="${line#*Components:}"
|
||||
for comp in $line; do
|
||||
[[ "$comp" == "$component" ]] && return 0
|
||||
done
|
||||
done < <(grep -h -E "^[^#]*Components:" /etc/apt/sources.list.d/*.sources 2>/dev/null)
|
||||
return 1
|
||||
}
|
||||
|
||||
require_whiptail() {
|
||||
|
||||
@@ -63,7 +63,14 @@ get_pve_major_minor() {
|
||||
|
||||
component_exists_in_sources() {
|
||||
local component="$1"
|
||||
grep -h -E "^[^#]*Components:[^#]*\b${component}\b" /etc/apt/sources.list.d/*.sources 2>/dev/null | grep -q .
|
||||
local line comp
|
||||
while IFS= read -r line; do
|
||||
line="${line#*Components:}"
|
||||
for comp in $line; do
|
||||
[[ "$comp" == "$component" ]] && return 0
|
||||
done
|
||||
done < <(grep -h -E "^[^#]*Components:" /etc/apt/sources.list.d/*.sources 2>/dev/null)
|
||||
return 1
|
||||
}
|
||||
|
||||
main() {
|
||||
|
||||
Reference in New Issue
Block a user