mirror of
https://github.com/community-scripts/ProxmoxVE.git
synced 2026-11-20 18:13:47 +01:00
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e5bc15ea54 | ||
|
|
01e23a0c50 |
No files matched your search
@@ -592,6 +592,10 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
|
||||
|
||||
- Stalwart: migrate to v1 with stalwart-migrate [@MickLesk](https://github.com/MickLesk) ([#18794](https://github.com/community-scripts/ProxmoxVE/pull/18794))
|
||||
|
||||
### 💾 Core
|
||||
|
||||
- fix: vm - name why an image step failed and open one message for the disk import [@MickLesk](https://github.com/MickLesk) ([core#279](https://github.com/community-scripts/core/pull/279))
|
||||
|
||||
## 2026-11-19
|
||||
|
||||
### 🆕 New Scripts
|
||||
|
||||
@@ -68,6 +68,11 @@ yq -i "
|
||||
(map(select(. != \"TZ=*\" and . != \"ACME_EMAIL=*\" and . != \"INITIAL_ADMIN_EMAIL=*\" and . != \"INITIAL_ADMIN_PASSWORD=*\")) +
|
||||
[\"TZ=$TZ_INPUT\", \"ACME_EMAIL=$ACME_EMAIL_INPUT\", \"INITIAL_ADMIN_EMAIL=admin@local.com\", \"INITIAL_ADMIN_PASSWORD=${ADMIN_PASS}\"])
|
||||
" /opt/compose.yaml
|
||||
# nginx in the NPMplus image cannot parse a link-local resolver with a zone ID (fe80::1%eth0)
|
||||
DNS_SERVERS="$(awk '/^nameserver/ && $2 !~ /%/ {print $2}' /etc/resolv.conf)"
|
||||
if grep -qE '^nameserver[[:space:]]+[^[:space:]]*%' /etc/resolv.conf && [[ -n "$DNS_SERVERS" ]]; then
|
||||
DNS_SERVERS="$DNS_SERVERS" yq -i '.services.npmplus.dns = (strenv(DNS_SERVERS) | split("\n"))' /opt/compose.yaml
|
||||
fi
|
||||
{
|
||||
echo "NPMplus Credentials"
|
||||
echo "Email: admin@local.com"
|
||||
|
||||
+9
-14
@@ -51,20 +51,18 @@ header_info
|
||||
echo "One moment please...\n"
|
||||
|
||||
function execute_in() {
|
||||
local container=$1 name rc=0
|
||||
name=$(pct config "$container" | awk '/^hostname:/ {print $2}')
|
||||
echo -e "${BL}[Info]${GN} Execute inside${BL} ${container} (${name})${GN} with output: ${CL}"
|
||||
# Run once; a failure in one container must not end the run for the others.
|
||||
pct exec "$container" -- bash -c "${custom_command}" | tee || rc=$?
|
||||
if [ "$rc" -eq 127 ]; then
|
||||
echo -e "${BL}[Info]${RD} ${container} (${name}) has no command: ${custom_command}${CL}"
|
||||
elif [ "$rc" -ne 0 ]; then
|
||||
echo -e "${BL}[Info]${RD} Command exited with code ${rc} in ${container} (${name})${CL}"
|
||||
container=$1
|
||||
name=$(pct exec "$container" hostname)
|
||||
echo -e "${BL}[Info]${GN} Execute inside${BL} ${name}${GN} with output: ${CL}"
|
||||
if ! pct exec "$container" -- bash -c "command ${custom_command} >/dev/null 2>&1"; then
|
||||
echo -e "${BL}[Info]${GN} Skipping ${name} ${RD}$container has no command: ${custom_command}"
|
||||
else
|
||||
pct exec "$container" -- bash -c "${custom_command}" | tee
|
||||
fi
|
||||
}
|
||||
|
||||
for container in $(pct list | awk '{if(NR>1) print $1}'); do
|
||||
if [[ " ${excluded_containers} " == *" ${container} "* ]]; then
|
||||
if [[ " ${excluded_containers[@]} " =~ " $container " ]]; then
|
||||
echo -e "${BL}[Info]${GN} Skipping ${BL}$container${CL}"
|
||||
else
|
||||
os=$(pct config "$container" | awk '/^ostype/ {print $2}')
|
||||
@@ -77,10 +75,7 @@ for container in $(pct list | awk '{if(NR>1) print $1}'); do
|
||||
template=$(pct config "$container" | grep -q "template:" && echo "true" || echo "false")
|
||||
if [ "$template" == "false" ] && [ "$status" == "status: stopped" ]; then
|
||||
echo -e "${BL}[Info]${GN} Starting${BL} $container ${CL}"
|
||||
if ! pct start "$container"; then
|
||||
echo -e "${BL}[Info]${RD} Skipping ${container}, it did not start${CL}"
|
||||
continue
|
||||
fi
|
||||
pct start "$container"
|
||||
echo -e "${BL}[Info]${GN} Waiting For${BL} $container${CL}${GN} To Start ${CL}"
|
||||
sleep 5
|
||||
execute_in "$container"
|
||||
|
||||
Reference in new issue
Block a user