mirror of
https://github.com/community-scripts/ProxmoxVE.git
synced 2026-04-28 13:20:40 +00:00
Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| eb5c6a4d66 | |||
| 103ec35b17 | |||
| 6070e4fcd2 | |||
| 4e89480e8c | |||
| 214b0dbcc1 | |||
| 062a91d178 | |||
| 1f178f17fc | |||
| 77909d343b | |||
| fef659d26d | |||
| ca23d95226 | |||
| fd729f1f16 | |||
| 8044f075cd | |||
| 1d4d3f63d1 |
+21
-1
@@ -442,23 +442,43 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
|
|||||||
|
|
||||||
</details>
|
</details>
|
||||||
|
|
||||||
|
## 2026-04-16
|
||||||
|
|
||||||
|
### 🚀 Updated Scripts
|
||||||
|
|
||||||
|
- #### 🐞 Bug Fixes
|
||||||
|
|
||||||
|
- Add pnpm as a dependency to ghost-cli install [@YourFavoriteKyle](https://github.com/YourFavoriteKyle) ([#13789](https://github.com/community-scripts/ProxmoxVE/pull/13789))
|
||||||
|
|
||||||
|
### 💾 Core
|
||||||
|
|
||||||
|
- #### ✨ New Features
|
||||||
|
|
||||||
|
- core: wire ENABLE_MKNOD and ALLOW_MOUNT_FS into LXC features [@MickLesk](https://github.com/MickLesk) ([#13796](https://github.com/community-scripts/ProxmoxVE/pull/13796))
|
||||||
|
|
||||||
## 2026-04-15
|
## 2026-04-15
|
||||||
|
|
||||||
### 🆕 New Scripts
|
### 🆕 New Scripts
|
||||||
|
|
||||||
- GitHub-Runner ([#13709](https://github.com/community-scripts/ProxmoxVE/pull/13709))
|
- iGotify ([#13773](https://github.com/community-scripts/ProxmoxVE/pull/13773))
|
||||||
|
- GitHub-Runner ([#13709](https://github.com/community-scripts/ProxmoxVE/pull/13709))
|
||||||
- Revert "Remove low-install-count CT scripts and installers (#13570)" [@CrazyWolf13](https://github.com/CrazyWolf13) ([#13752](https://github.com/community-scripts/ProxmoxVE/pull/13752))
|
- Revert "Remove low-install-count CT scripts and installers (#13570)" [@CrazyWolf13](https://github.com/CrazyWolf13) ([#13752](https://github.com/community-scripts/ProxmoxVE/pull/13752))
|
||||||
|
|
||||||
### 🚀 Updated Scripts
|
### 🚀 Updated Scripts
|
||||||
|
|
||||||
- #### 🐞 Bug Fixes
|
- #### 🐞 Bug Fixes
|
||||||
|
|
||||||
|
- [alpine-nextcloud] Update Nginx MIME types to support .mjs files [@GuiltyFox](https://github.com/GuiltyFox) ([#13771](https://github.com/community-scripts/ProxmoxVE/pull/13771))
|
||||||
- Domain Monitor: Fix file ownership after update [@tremor021](https://github.com/tremor021) ([#13759](https://github.com/community-scripts/ProxmoxVE/pull/13759))
|
- Domain Monitor: Fix file ownership after update [@tremor021](https://github.com/tremor021) ([#13759](https://github.com/community-scripts/ProxmoxVE/pull/13759))
|
||||||
|
|
||||||
- #### 💥 Breaking Changes
|
- #### 💥 Breaking Changes
|
||||||
|
|
||||||
- Reitti: refactor scripts for v4 - remove RabbitMQ and Photon [@MickLesk](https://github.com/MickLesk) ([#13728](https://github.com/community-scripts/ProxmoxVE/pull/13728))
|
- Reitti: refactor scripts for v4 - remove RabbitMQ and Photon [@MickLesk](https://github.com/MickLesk) ([#13728](https://github.com/community-scripts/ProxmoxVE/pull/13728))
|
||||||
|
|
||||||
|
- #### 🔧 Refactor
|
||||||
|
|
||||||
|
- Semaphore: add BoltDB to SQLite migration [@tremor021](https://github.com/tremor021) ([#13779](https://github.com/community-scripts/ProxmoxVE/pull/13779))
|
||||||
|
|
||||||
### 📚 Documentation
|
### 📚 Documentation
|
||||||
|
|
||||||
- cleanup: remove docs/, update README & CONTRIBUTING, fix repo config [@MickLesk](https://github.com/MickLesk) ([#13770](https://github.com/community-scripts/ProxmoxVE/pull/13770))
|
- cleanup: remove docs/, update README & CONTRIBUTING, fix repo config [@MickLesk](https://github.com/MickLesk) ([#13770](https://github.com/community-scripts/ProxmoxVE/pull/13770))
|
||||||
|
|||||||
+1
-1
@@ -25,7 +25,7 @@ function update_script() {
|
|||||||
check_container_resources
|
check_container_resources
|
||||||
|
|
||||||
setup_mariadb
|
setup_mariadb
|
||||||
NODE_VERSION="22" setup_nodejs
|
NODE_VERSION="22" NODE_MODULE="pnpm" setup_nodejs
|
||||||
ensure_dependencies git
|
ensure_dependencies git
|
||||||
|
|
||||||
msg_info "Updating Ghost"
|
msg_info "Updating Ghost"
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
_ ______ __ _ ____
|
||||||
|
(_) ____/___ / /_(_) __/_ __
|
||||||
|
/ / / __/ __ \/ __/ / /_/ / / /
|
||||||
|
/ / /_/ / /_/ / /_/ / __/ /_/ /
|
||||||
|
/_/\____/\____/\__/_/_/ \__, /
|
||||||
|
/____/
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func)
|
||||||
|
# Copyright (c) 2021-2026 community-scripts ORG
|
||||||
|
# Author: pfassina
|
||||||
|
# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
|
||||||
|
# Source: https://github.com/androidseb25/iGotify-Notification-Assistent
|
||||||
|
|
||||||
|
APP="iGotify"
|
||||||
|
var_tags="${var_tags:-notifications;gotify}"
|
||||||
|
var_cpu="${var_cpu:-2}"
|
||||||
|
var_ram="${var_ram:-2048}"
|
||||||
|
var_disk="${var_disk:-4}"
|
||||||
|
var_os="${var_os:-debian}"
|
||||||
|
var_version="${var_version:-13}"
|
||||||
|
var_unprivileged="${var_unprivileged:-1}"
|
||||||
|
|
||||||
|
header_info "$APP"
|
||||||
|
variables
|
||||||
|
color
|
||||||
|
catch_errors
|
||||||
|
|
||||||
|
function update_script() {
|
||||||
|
header_info
|
||||||
|
check_container_storage
|
||||||
|
check_container_resources
|
||||||
|
|
||||||
|
if [[ ! -d /opt/igotify ]]; then
|
||||||
|
msg_error "No iGotify Installation Found!"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
if check_for_gh_release "igotify" "androidseb25/iGotify-Notification-Assistent"; then
|
||||||
|
msg_info "Stopping Service"
|
||||||
|
systemctl stop igotify
|
||||||
|
msg_ok "Stopped Service"
|
||||||
|
|
||||||
|
msg_info "Backing up Configuration"
|
||||||
|
cp /opt/igotify/.env /opt/igotify.env.bak
|
||||||
|
msg_ok "Backed up Configuration"
|
||||||
|
|
||||||
|
CLEAN_INSTALL=1 fetch_and_deploy_gh_release "igotify" "androidseb25/iGotify-Notification-Assistent" "prebuild" "latest" "/opt/igotify" "iGotify-Notification-Service-amd64-v*.zip"
|
||||||
|
|
||||||
|
msg_info "Restoring Configuration"
|
||||||
|
cp /opt/igotify.env.bak /opt/igotify/.env
|
||||||
|
rm -f /opt/igotify.env.bak
|
||||||
|
msg_ok "Restored Configuration"
|
||||||
|
|
||||||
|
msg_info "Starting Service"
|
||||||
|
systemctl start igotify
|
||||||
|
msg_ok "Started Service"
|
||||||
|
msg_ok "Updated successfully!"
|
||||||
|
fi
|
||||||
|
exit
|
||||||
|
}
|
||||||
|
|
||||||
|
start
|
||||||
|
build_container
|
||||||
|
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}"
|
||||||
+7
-9
@@ -29,18 +29,16 @@ function update_script() {
|
|||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if check_for_gh_release "semaphore" "semaphoreui/semaphore"; then
|
||||||
if [[ -f /opt/semaphore/semaphore_db.bolt ]]; then
|
if [[ -f /opt/semaphore/semaphore_db.bolt ]]; then
|
||||||
msg_warn "WARNING: Due to bugs with BoltDB database, update script will move your application"
|
msg_warn "WARNING: Due to bugs with BoltDB database, update script will move your application"
|
||||||
msg_warn "to use SQLite database instead. Unfortunately, this will reset your application and make it a fresh"
|
msg_warn "to use SQLite database instead. Make sure you have a backup of your data!"
|
||||||
msg_warn "installation. All your data will be lost!"
|
|
||||||
echo ""
|
echo ""
|
||||||
read -r -p "${TAB3}Do you want to continue? (y/N): " CONFIRM
|
read -r -p "${TAB3}Do you want to continue? (y/N): " CONFIRM
|
||||||
if [[ ! "$CONFIRM" =~ ^[Yy]$ ]]; then
|
if [[ ! "$CONFIRM" =~ ^[Yy]$ ]]; then
|
||||||
exit 0
|
exit 0
|
||||||
else
|
else
|
||||||
msg_info "Moving from BoltDB to SQLite"
|
msg_info "Moving from BoltDB to SQLite"
|
||||||
systemctl stop semaphore
|
|
||||||
rm -rf /opt/semaphore/semaphore_db.bolt
|
|
||||||
sed -i \
|
sed -i \
|
||||||
-e 's|"bolt": {|"sqlite": {|' \
|
-e 's|"bolt": {|"sqlite": {|' \
|
||||||
-e 's|/semaphore_db.bolt"|/database.sqlite"|' \
|
-e 's|/semaphore_db.bolt"|/database.sqlite"|' \
|
||||||
@@ -48,21 +46,21 @@ function update_script() {
|
|||||||
-e '/"dialect"/d' \
|
-e '/"dialect"/d' \
|
||||||
-e '/^ },$/a\ "dialect": "sqlite",' \
|
-e '/^ },$/a\ "dialect": "sqlite",' \
|
||||||
/opt/semaphore/config.json
|
/opt/semaphore/config.json
|
||||||
SEM_PW=$(cat ~/semaphore.creds)
|
|
||||||
systemctl start semaphore
|
|
||||||
$STD semaphore user add --admin --login admin --email admin@community-scripts.org --name Administrator --password "${SEM_PW}" --config /opt/semaphore/config.json
|
|
||||||
|
|
||||||
msg_ok "Moved from BoltDB to SQLite"
|
msg_ok "Moved from BoltDB to SQLite"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if check_for_gh_release "semaphore" "semaphoreui/semaphore"; then
|
|
||||||
msg_info "Stopping Service"
|
msg_info "Stopping Service"
|
||||||
systemctl stop semaphore
|
systemctl stop semaphore
|
||||||
msg_ok "Stopped Service"
|
msg_ok "Stopped Service"
|
||||||
|
|
||||||
fetch_and_deploy_gh_release "semaphore" "semaphoreui/semaphore" "binary" "latest" "/opt/semaphore" "semaphore_*_linux_amd64.deb"
|
fetch_and_deploy_gh_release "semaphore" "semaphoreui/semaphore" "binary" "latest" "/opt/semaphore" "semaphore_*_linux_amd64.deb"
|
||||||
|
|
||||||
|
if [[ -f /opt/semaphore/semaphore_db.bolt ]]; then
|
||||||
|
$STD semaphore migrate --from-boltdb /opt/semaphore/semaphore_db.bolt --config /opt/semaphore/config.json
|
||||||
|
rm -f /opt/semaphore/semaphore_db.bolt
|
||||||
|
fi
|
||||||
|
|
||||||
msg_info "Starting Service"
|
msg_info "Starting Service"
|
||||||
systemctl start semaphore
|
systemctl start semaphore
|
||||||
msg_ok "Started Service"
|
msg_ok "Started Service"
|
||||||
|
|||||||
@@ -137,6 +137,7 @@ EOF
|
|||||||
sed -i -e 's|memory_limit = 128M|memory_limit = 512M|; $aapc.enable_cli=1' /etc/php83/php.ini
|
sed -i -e 's|memory_limit = 128M|memory_limit = 512M|; $aapc.enable_cli=1' /etc/php83/php.ini
|
||||||
sed -i -e 's|upload_max_file_size = 2M|upload_max_file_size = 16G|' /etc/php83/php.ini
|
sed -i -e 's|upload_max_file_size = 2M|upload_max_file_size = 16G|' /etc/php83/php.ini
|
||||||
sed -i -E '/^php_admin_(flag|value)\[opcache/s/^/;/' /etc/php83/php-fpm.d/nextcloud.conf
|
sed -i -E '/^php_admin_(flag|value)\[opcache/s/^/;/' /etc/php83/php-fpm.d/nextcloud.conf
|
||||||
|
sed -i -e 's| js;| mjs js;|' /etc/nginx/mime.types
|
||||||
msg_ok "Installed Nextcloud"
|
msg_ok "Installed Nextcloud"
|
||||||
|
|
||||||
msg_info "Adding Additional Nextcloud Packages"
|
msg_info "Adding Additional Nextcloud Packages"
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ msg_ok "Installed Dependencies"
|
|||||||
|
|
||||||
setup_mariadb
|
setup_mariadb
|
||||||
MARIADB_DB_NAME="ghost" MARIADB_DB_USER="ghostuser" setup_mariadb_db
|
MARIADB_DB_NAME="ghost" MARIADB_DB_USER="ghostuser" setup_mariadb_db
|
||||||
NODE_VERSION="22" setup_nodejs
|
NODE_VERSION="22" NODE_MODULE="pnpm" setup_nodejs
|
||||||
|
|
||||||
msg_info "Installing Ghost CLI"
|
msg_info "Installing Ghost CLI"
|
||||||
$STD npm install ghost-cli@latest -g
|
$STD npm install ghost-cli@latest -g
|
||||||
|
|||||||
@@ -0,0 +1,59 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# Copyright (c) 2021-2026 community-scripts ORG
|
||||||
|
# Author: pfassina
|
||||||
|
# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
|
||||||
|
# Source: https://github.com/androidseb25/iGotify-Notification-Assistent
|
||||||
|
|
||||||
|
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
|
||||||
|
color
|
||||||
|
verb_ip6
|
||||||
|
catch_errors
|
||||||
|
setting_up_container
|
||||||
|
network_check
|
||||||
|
update_os
|
||||||
|
|
||||||
|
msg_info "Installing Dependencies"
|
||||||
|
setup_deb822_repo \
|
||||||
|
"microsoft" \
|
||||||
|
"https://packages.microsoft.com/keys/microsoft-2025.asc" \
|
||||||
|
"https://packages.microsoft.com/debian/13/prod/" \
|
||||||
|
"trixie" \
|
||||||
|
"main"
|
||||||
|
$STD apt install -y aspnetcore-runtime-10.0
|
||||||
|
msg_ok "Installed Dependencies"
|
||||||
|
|
||||||
|
fetch_and_deploy_gh_release "igotify" "androidseb25/iGotify-Notification-Assistent" "prebuild" "latest" "/opt/igotify" "iGotify-Notification-Service-amd64-v*.zip"
|
||||||
|
|
||||||
|
msg_info "Creating Service"
|
||||||
|
cat <<EOF >/opt/igotify/.env
|
||||||
|
ASPNETCORE_URLS=http://0.0.0.0:80
|
||||||
|
ASPNETCORE_ENVIRONMENT=Production
|
||||||
|
GOTIFY_DEFAULTUSER_PASS=
|
||||||
|
GOTIFY_URLS=
|
||||||
|
GOTIFY_CLIENT_TOKENS=
|
||||||
|
SECNTFY_TOKENS=
|
||||||
|
EOF
|
||||||
|
cat <<EOF >/etc/systemd/system/igotify.service
|
||||||
|
[Unit]
|
||||||
|
Description=iGotify Notification Service
|
||||||
|
After=network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
EnvironmentFile=/opt/igotify/.env
|
||||||
|
WorkingDirectory=/opt/igotify
|
||||||
|
ExecStart=/usr/bin/dotnet "/opt/igotify/iGotify Notification Assist.dll"
|
||||||
|
Restart=always
|
||||||
|
RestartSec=10
|
||||||
|
KillSignal=SIGINT
|
||||||
|
TimeoutStopSec=10
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
EOF
|
||||||
|
systemctl enable -q --now igotify
|
||||||
|
msg_ok "Created Service"
|
||||||
|
|
||||||
|
motd_ssh
|
||||||
|
customize
|
||||||
|
cleanup_lxc
|
||||||
+25
-10
@@ -344,21 +344,36 @@ explain_exit_code() {
|
|||||||
# - Escapes a string for safe JSON embedding
|
# - Escapes a string for safe JSON embedding
|
||||||
# - Strips ANSI escape sequences and non-printable control characters
|
# - Strips ANSI escape sequences and non-printable control characters
|
||||||
# - Handles backslashes, quotes, newlines, tabs, and carriage returns
|
# - Handles backslashes, quotes, newlines, tabs, and carriage returns
|
||||||
|
# - Uses jq when available (guaranteed correct), falls back to awk
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
json_escape() {
|
json_escape() {
|
||||||
# Escape a string for safe JSON embedding using awk (handles any input size).
|
local input
|
||||||
# Pipeline: strip ANSI → remove control chars → escape \ " TAB → join lines with \n
|
# Pipeline: strip ANSI → remove control chars → escape for JSON
|
||||||
printf '%s' "$1" |
|
input=$(printf '%s' "$1" |
|
||||||
sed 's/\x1b\[[0-9;]*[a-zA-Z]//g' |
|
sed 's/\x1b\[[0-9;]*[a-zA-Z]//g' |
|
||||||
tr -d '\000-\010\013\014\016-\037\177\r' |
|
tr -d '\000-\010\013\014\016-\037\177\r')
|
||||||
|
|
||||||
|
# Prefer jq: guaranteed correct JSON string encoding (handles all edge cases)
|
||||||
|
if command -v jq &>/dev/null; then
|
||||||
|
# jq -Rs reads raw stdin as string, outputs JSON-encoded string with quotes.
|
||||||
|
# We strip the surrounding quotes since the heredoc adds them.
|
||||||
|
printf '%s' "$input" | jq -Rs '.' | sed 's/^"//;s/"$//'
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Fallback: character-by-character processing with awk (avoids gsub replacement pitfalls)
|
||||||
|
printf '%s' "$input" |
|
||||||
awk '
|
awk '
|
||||||
BEGIN { ORS = "" }
|
BEGIN { ORS="" }
|
||||||
{
|
{
|
||||||
gsub(/\\/, "\\\\") # backslash → \\
|
if (NR > 1) printf "%s", "\\n"
|
||||||
gsub(/"/, "\\\"") # double quote → \"
|
for (i = 1; i <= length($0); i++) {
|
||||||
gsub(/\t/, "\\t") # tab → \t
|
c = substr($0, i, 1)
|
||||||
if (NR > 1) printf "\\n"
|
if (c == "\\") printf "%s", "\\\\"
|
||||||
printf "%s", $0
|
else if (c == "\"") printf "%s", "\\\""
|
||||||
|
else if (c == "\t") printf "%s", "\\t"
|
||||||
|
else printf "%s", c
|
||||||
|
}
|
||||||
}'
|
}'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+58
-16
@@ -979,7 +979,6 @@ base_settings() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
IPV6_METHOD=${var_ipv6_method:-"none"}
|
IPV6_METHOD=${var_ipv6_method:-"none"}
|
||||||
IPV6_STATIC=${var_ipv6_static:-""}
|
|
||||||
GATE=${var_gateway:-""}
|
GATE=${var_gateway:-""}
|
||||||
APT_CACHER=${var_apt_cacher:-""}
|
APT_CACHER=${var_apt_cacher:-""}
|
||||||
APT_CACHER_IP=${var_apt_cacher_ip:-""}
|
APT_CACHER_IP=${var_apt_cacher_ip:-""}
|
||||||
@@ -1015,8 +1014,12 @@ base_settings() {
|
|||||||
VLAN=${var_vlan:-""}
|
VLAN=${var_vlan:-""}
|
||||||
SSH=${var_ssh:-"no"}
|
SSH=${var_ssh:-"no"}
|
||||||
SSH_AUTHORIZED_KEY=${var_ssh_authorized_key:-""}
|
SSH_AUTHORIZED_KEY=${var_ssh_authorized_key:-""}
|
||||||
UDHCPC_FIX=${var_udhcpc_fix:-""}
|
# Build TAGS: ensure community-script prefix, use semicolons (pct format), no duplicates
|
||||||
TAGS="community-script,${var_tags:-}"
|
if [[ "${var_tags:-}" == *community-script* ]]; then
|
||||||
|
TAGS="${var_tags:-community-script}"
|
||||||
|
else
|
||||||
|
TAGS="community-script${var_tags:+;${var_tags}}"
|
||||||
|
fi
|
||||||
ENABLE_FUSE=${var_fuse:-"${1:-no}"}
|
ENABLE_FUSE=${var_fuse:-"${1:-no}"}
|
||||||
ENABLE_TUN=${var_tun:-"${1:-no}"}
|
ENABLE_TUN=${var_tun:-"${1:-no}"}
|
||||||
|
|
||||||
@@ -1025,6 +1028,7 @@ base_settings() {
|
|||||||
ENABLE_NESTING=${var_nesting:-"1"}
|
ENABLE_NESTING=${var_nesting:-"1"}
|
||||||
ENABLE_KEYCTL=${var_keyctl:-"0"}
|
ENABLE_KEYCTL=${var_keyctl:-"0"}
|
||||||
ENABLE_MKNOD=${var_mknod:-"0"}
|
ENABLE_MKNOD=${var_mknod:-"0"}
|
||||||
|
ALLOW_MOUNT_FS=${var_mount_fs:-""}
|
||||||
PROTECT_CT=${var_protection:-"no"}
|
PROTECT_CT=${var_protection:-"no"}
|
||||||
CT_TIMEZONE=${var_timezone:-"$timezone"}
|
CT_TIMEZONE=${var_timezone:-"$timezone"}
|
||||||
[[ "${CT_TIMEZONE:-}" == Etc/* ]] && CT_TIMEZONE="host" # pct doesn't accept Etc/* zones
|
[[ "${CT_TIMEZONE:-}" == Etc/* ]] && CT_TIMEZONE="host" # pct doesn't accept Etc/* zones
|
||||||
@@ -1203,6 +1207,18 @@ load_vars_file() {
|
|||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
var_mknod)
|
||||||
|
if [[ "$var_val" != "0" && "$var_val" != "1" ]]; then
|
||||||
|
msg_warn "Invalid mknod value '$var_val' in $file (must be 0 or 1), ignoring"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
var_mount_fs)
|
||||||
|
if [[ ! "$var_val" =~ ^[a-zA-Z0-9,]+$ ]]; then
|
||||||
|
msg_warn "Invalid mount_fs value '$var_val' in $file (comma-separated fs names only, e.g. nfs,cifs), ignoring"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
;;
|
||||||
var_ipv6_method)
|
var_ipv6_method)
|
||||||
if [[ "$var_val" != "auto" && "$var_val" != "dhcp" && "$var_val" != "static" && "$var_val" != "none" ]]; then
|
if [[ "$var_val" != "auto" && "$var_val" != "dhcp" && "$var_val" != "static" && "$var_val" != "none" ]]; then
|
||||||
msg_warn "Invalid IPv6 method '$var_val' in $file (must be auto/dhcp/static/none), ignoring"
|
msg_warn "Invalid IPv6 method '$var_val' in $file (must be auto/dhcp/static/none), ignoring"
|
||||||
@@ -1428,10 +1444,10 @@ get_app_defaults_path() {
|
|||||||
if ! declare -p VAR_WHITELIST >/dev/null 2>&1; then
|
if ! declare -p VAR_WHITELIST >/dev/null 2>&1; then
|
||||||
# Note: Removed var_ctid (can only exist once), var_ipv6_static (static IPs are unique)
|
# Note: Removed var_ctid (can only exist once), var_ipv6_static (static IPs are unique)
|
||||||
declare -ag VAR_WHITELIST=(
|
declare -ag VAR_WHITELIST=(
|
||||||
var_apt_cacher var_apt_cacher_ip var_brg var_cpu var_disk var_fuse var_github_token var_gpu
|
var_apt_cacher var_apt_cacher_ip var_brg var_cpu var_disk var_fuse var_github_token var_gpu var_keyctl
|
||||||
var_gateway var_hostname var_ipv6_method var_mac var_mtu
|
var_gateway var_hostname var_ipv6_method var_mac var_mknod var_mount_fs var_mtu
|
||||||
var_net var_ns var_os var_pw var_ram var_tags var_tun var_unprivileged
|
var_net var_nesting var_ns var_os var_protection var_pw var_ram var_tags var_timezone var_tun var_unprivileged
|
||||||
var_verbose var_version var_vlan var_ssh var_ssh_authorized_key var_container_storage var_template_storage
|
var_verbose var_version var_vlan var_ssh var_ssh_authorized_key var_container_storage var_template_storage var_searchdomain
|
||||||
)
|
)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -1781,7 +1797,12 @@ advanced_settings() {
|
|||||||
trap 'tput rmcup 2>/dev/null || true' RETURN
|
trap 'tput rmcup 2>/dev/null || true' RETURN
|
||||||
|
|
||||||
# Initialize defaults
|
# Initialize defaults
|
||||||
TAGS="community-script;${var_tags:-}"
|
# Build TAGS: ensure community-script prefix, use semicolons (pct format), no duplicates
|
||||||
|
if [[ "${var_tags:-}" == *community-script* ]]; then
|
||||||
|
TAGS="${var_tags:-community-script}"
|
||||||
|
else
|
||||||
|
TAGS="community-script${var_tags:+;${var_tags}}"
|
||||||
|
fi
|
||||||
local STEP=1
|
local STEP=1
|
||||||
local MAX_STEP=28
|
local MAX_STEP=28
|
||||||
|
|
||||||
@@ -2518,6 +2539,13 @@ advanced_settings() {
|
|||||||
# STEP 22: Keyctl Support (Docker/systemd)
|
# STEP 22: Keyctl Support (Docker/systemd)
|
||||||
# ═══════════════════════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════════════════════
|
||||||
22)
|
22)
|
||||||
|
# Keyctl is always required for unprivileged containers — skip dialog
|
||||||
|
if [[ "$_ct_type" == "1" ]]; then
|
||||||
|
_enable_keyctl="1"
|
||||||
|
((STEP++))
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
local keyctl_default_flag="--defaultno"
|
local keyctl_default_flag="--defaultno"
|
||||||
[[ "$_enable_keyctl" == "1" ]] && keyctl_default_flag=""
|
[[ "$_enable_keyctl" == "1" ]] && keyctl_default_flag=""
|
||||||
|
|
||||||
@@ -2525,7 +2553,7 @@ advanced_settings() {
|
|||||||
--title "KEYCTL SUPPORT" \
|
--title "KEYCTL SUPPORT" \
|
||||||
--ok-button "Next" --cancel-button "Back" \
|
--ok-button "Next" --cancel-button "Back" \
|
||||||
$keyctl_default_flag \
|
$keyctl_default_flag \
|
||||||
--yesno "\nEnable Keyctl support?\n\nRequired for: Docker containers, systemd-networkd,\nand kernel keyring operations.\n\nNote: Automatically enabled for unprivileged containers.\n\n(App default: ${var_keyctl:-0})" 16 62; then
|
--yesno "\nEnable Keyctl support?\n\nRequired for: Docker containers, systemd-networkd,\nand kernel keyring operations.\n\n(App default: ${var_keyctl:-0})" 14 62; then
|
||||||
_enable_keyctl="1"
|
_enable_keyctl="1"
|
||||||
else
|
else
|
||||||
if [ $? -eq 1 ]; then
|
if [ $? -eq 1 ]; then
|
||||||
@@ -2711,6 +2739,7 @@ Network:
|
|||||||
Features:
|
Features:
|
||||||
FUSE: $_enable_fuse | TUN: $_enable_tun
|
FUSE: $_enable_fuse | TUN: $_enable_tun
|
||||||
Nesting: $nesting_desc | Keyctl: $keyctl_desc
|
Nesting: $nesting_desc | Keyctl: $keyctl_desc
|
||||||
|
Mknod: $([ "$_enable_mknod" == "1" ] && echo Enabled || echo Disabled) | Mount FS: ${_mount_fs:-(none)}
|
||||||
GPU: $_enable_gpu | Protection: $protect_desc
|
GPU: $_enable_gpu | Protection: $protect_desc
|
||||||
|
|
||||||
Advanced:
|
Advanced:
|
||||||
@@ -2780,13 +2809,6 @@ Advanced:
|
|||||||
[[ -n "$_mac" ]] && MAC=",hwaddr=$_mac" || MAC=""
|
[[ -n "$_mac" ]] && MAC=",hwaddr=$_mac" || MAC=""
|
||||||
[[ -n "$_vlan" ]] && VLAN=",tag=$_vlan" || VLAN=""
|
[[ -n "$_vlan" ]] && VLAN=",tag=$_vlan" || VLAN=""
|
||||||
|
|
||||||
# Alpine UDHCPC fix
|
|
||||||
if [ "$var_os" == "alpine" ] && [ "$NET" == "dhcp" ] && [ -n "$_ns" ]; then
|
|
||||||
UDHCPC_FIX="yes"
|
|
||||||
else
|
|
||||||
UDHCPC_FIX="no"
|
|
||||||
fi
|
|
||||||
export UDHCPC_FIX
|
|
||||||
export SSH_KEYS_FILE
|
export SSH_KEYS_FILE
|
||||||
|
|
||||||
# Exit alternate screen buffer before showing summary (so output remains visible)
|
# Exit alternate screen buffer before showing summary (so output remains visible)
|
||||||
@@ -2811,6 +2833,8 @@ Advanced:
|
|||||||
echo -e "${CONTAINERTYPE}${BOLD}${DGN}Nesting: ${BGN}$([ "${ENABLE_NESTING:-1}" == "1" ] && echo "Enabled" || echo "Disabled")${CL}"
|
echo -e "${CONTAINERTYPE}${BOLD}${DGN}Nesting: ${BGN}$([ "${ENABLE_NESTING:-1}" == "1" ] && echo "Enabled" || echo "Disabled")${CL}"
|
||||||
[[ "${ENABLE_KEYCTL:-0}" == "1" ]] && echo -e "${CONTAINERTYPE}${BOLD}${DGN}Keyctl: ${BGN}Enabled${CL}"
|
[[ "${ENABLE_KEYCTL:-0}" == "1" ]] && echo -e "${CONTAINERTYPE}${BOLD}${DGN}Keyctl: ${BGN}Enabled${CL}"
|
||||||
echo -e "${GPU}${BOLD}${DGN}GPU Passthrough: ${BGN}${ENABLE_GPU:-no}${CL}"
|
echo -e "${GPU}${BOLD}${DGN}GPU Passthrough: ${BGN}${ENABLE_GPU:-no}${CL}"
|
||||||
|
[[ "${ENABLE_MKNOD:-0}" == "1" ]] && echo -e "${CONTAINERTYPE}${BOLD}${DGN}Mknod: ${BGN}Enabled${CL}"
|
||||||
|
[[ -n "${ALLOW_MOUNT_FS:-}" ]] && echo -e "${CONTAINERTYPE}${BOLD}${DGN}Mount FS: ${BGN}${ALLOW_MOUNT_FS}${CL}"
|
||||||
[[ "${PROTECT_CT:-no}" == "yes" || "${PROTECT_CT:-no}" == "1" ]] && echo -e "${CONTAINERTYPE}${BOLD}${DGN}Protection: ${BGN}Enabled${CL}"
|
[[ "${PROTECT_CT:-no}" == "yes" || "${PROTECT_CT:-no}" == "1" ]] && echo -e "${CONTAINERTYPE}${BOLD}${DGN}Protection: ${BGN}Enabled${CL}"
|
||||||
[[ -n "${CT_TIMEZONE:-}" ]] && echo -e "${INFO}${BOLD}${DGN}Timezone: ${BGN}$CT_TIMEZONE${CL}"
|
[[ -n "${CT_TIMEZONE:-}" ]] && echo -e "${INFO}${BOLD}${DGN}Timezone: ${BGN}$CT_TIMEZONE${CL}"
|
||||||
[[ "$APT_CACHER" == "yes" ]] && echo -e "${INFO}${BOLD}${DGN}APT Cacher: ${BGN}$APT_CACHER_IP${CL}"
|
[[ "$APT_CACHER" == "yes" ]] && echo -e "${INFO}${BOLD}${DGN}APT Cacher: ${BGN}$APT_CACHER_IP${CL}"
|
||||||
@@ -2833,6 +2857,8 @@ Advanced:
|
|||||||
log_msg "IPv6: $IPV6_METHOD"
|
log_msg "IPv6: $IPV6_METHOD"
|
||||||
log_msg "FUSE Support: ${ENABLE_FUSE:-no}"
|
log_msg "FUSE Support: ${ENABLE_FUSE:-no}"
|
||||||
log_msg "Nesting: $([ "${ENABLE_NESTING:-1}" == "1" ] && echo "Enabled" || echo "Disabled")"
|
log_msg "Nesting: $([ "${ENABLE_NESTING:-1}" == "1" ] && echo "Enabled" || echo "Disabled")"
|
||||||
|
log_msg "Mknod: $([ "${ENABLE_MKNOD:-0}" == "1" ] && echo "Enabled" || echo "Disabled")"
|
||||||
|
[[ -n "${ALLOW_MOUNT_FS:-}" ]] && log_msg "Mount FS: ${ALLOW_MOUNT_FS}"
|
||||||
log_msg "GPU Passthrough: ${ENABLE_GPU:-no}"
|
log_msg "GPU Passthrough: ${ENABLE_GPU:-no}"
|
||||||
log_msg "Verbose Mode: $VERBOSE"
|
log_msg "Verbose Mode: $VERBOSE"
|
||||||
log_msg "Session ID: ${SESSION_ID}"
|
log_msg "Session ID: ${SESSION_ID}"
|
||||||
@@ -3612,6 +3638,18 @@ build_container() {
|
|||||||
FEATURES="${FEATURES}fuse=1"
|
FEATURES="${FEATURES}fuse=1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Mknod support (user configurable via advanced settings)
|
||||||
|
if [ "${ENABLE_MKNOD:-0}" == "1" ]; then
|
||||||
|
[ -n "$FEATURES" ] && FEATURES="$FEATURES,"
|
||||||
|
FEATURES="${FEATURES}mknod=1"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Mount filesystem types (user configurable via advanced settings)
|
||||||
|
if [ -n "${ALLOW_MOUNT_FS:-}" ]; then
|
||||||
|
[ -n "$FEATURES" ] && FEATURES="$FEATURES,"
|
||||||
|
FEATURES="${FEATURES}mount=${ALLOW_MOUNT_FS//,/;}"
|
||||||
|
fi
|
||||||
|
|
||||||
# Build PCT_OPTIONS as string for export
|
# Build PCT_OPTIONS as string for export
|
||||||
local _func_url
|
local _func_url
|
||||||
if [ "$var_os" == "alpine" ]; then
|
if [ "$var_os" == "alpine" ]; then
|
||||||
@@ -5751,6 +5789,9 @@ create_lxc_container() {
|
|||||||
msg_debug "Logfile: $LOGFILE"
|
msg_debug "Logfile: $LOGFILE"
|
||||||
|
|
||||||
# First attempt (PCT_OPTIONS is a multi-line string, use it directly)
|
# First attempt (PCT_OPTIONS is a multi-line string, use it directly)
|
||||||
|
# Disable globbing: unquoted $PCT_OPTIONS needs word-splitting but must not glob-expand
|
||||||
|
# (e.g. passwords containing * or ? would match filenames otherwise)
|
||||||
|
set -f
|
||||||
if ! pct create "$CTID" "${TEMPLATE_STORAGE}:vztmpl/${TEMPLATE}" $PCT_OPTIONS >"$LOGFILE" 2>&1; then
|
if ! pct create "$CTID" "${TEMPLATE_STORAGE}:vztmpl/${TEMPLATE}" $PCT_OPTIONS >"$LOGFILE" 2>&1; then
|
||||||
msg_debug "Container creation failed on ${TEMPLATE_STORAGE}. Checking error..."
|
msg_debug "Container creation failed on ${TEMPLATE_STORAGE}. Checking error..."
|
||||||
|
|
||||||
@@ -5858,6 +5899,7 @@ create_lxc_container() {
|
|||||||
fi
|
fi
|
||||||
fi # close CTID collision else-branch
|
fi # close CTID collision else-branch
|
||||||
fi
|
fi
|
||||||
|
set +f # re-enable globbing after pct create block
|
||||||
|
|
||||||
# Verify container exists (allow up to 10s for pmxcfs sync in clusters)
|
# Verify container exists (allow up to 10s for pmxcfs sync in clusters)
|
||||||
local _pct_visible=false
|
local _pct_visible=false
|
||||||
|
|||||||
Reference in New Issue
Block a user