Compare commits

..
Author SHA1 Message Date
MickLesk e5bc15ea54 NPMplus: hand Docker the usable DNS servers when resolv.conf has a zone ID
The released NPMplus image (2026-11-18-r1) reads /etc/resolv.conf for its nginx resolver and stops with "invalid IPv6 address in resolver" on a link-local server like fe80::1%eth0. NPMplus has no resolver setting; its develop branch already skips such entries. Until that ships, the install writes the other nameservers to compose.yaml as dns.
2026-11-20 17:00:19 +01:00
3 changed files with 7 additions and 8 deletions

No files matched your search

+1 -4
View File
@@ -68,10 +68,7 @@ function update_script() {
msg_info "Patching nginx HTTP/2 (CVE-2026-123007, CVE-2026-123633)"
for commit in 61031503dc8087c2c17cd2142c9b4b19062f90c4 2df48a501d0fb8212b7d39dffeeff5876332ba59 e27f5fa84fe6e98505e70bc543b748747dad0a3b; do
curl_with_retry "https://api.github.com/repos/nginx/nginx/commits/${commit}" "/tmp/nginx-${commit}.patch" "-HAccept:application/vnd.github.patch" ||
curl_with_retry "https://github.com/nginx/nginx/commit/${commit}.patch" "/tmp/nginx-${commit}.patch"
patch -d /opt/openresty/bundle/nginx-1.31.8 -p1 --forward -s <"/tmp/nginx-${commit}.patch"
rm -f "/tmp/nginx-${commit}.patch"
curl_with_retry "https://github.com/nginx/nginx/commit/${commit}.patch" "-" | patch -d /opt/openresty/bundle/nginx-1.31.8 -p1 --forward -s
done
msg_ok "Patched nginx HTTP/2"
+1 -4
View File
@@ -42,10 +42,7 @@ fetch_and_deploy_from_url "https://openresty.org/download/openresty-${OPENRESTY_
msg_info "Patching nginx HTTP/2 (CVE-2026-123007, CVE-2026-123633)"
for commit in 61031503dc8087c2c17cd2142c9b4b19062f90c4 2df48a501d0fb8212b7d39dffeeff5876332ba59 e27f5fa84fe6e98505e70bc543b748747dad0a3b; do
curl_with_retry "https://api.github.com/repos/nginx/nginx/commits/${commit}" "/tmp/nginx-${commit}.patch" "-HAccept:application/vnd.github.patch" ||
curl_with_retry "https://github.com/nginx/nginx/commit/${commit}.patch" "/tmp/nginx-${commit}.patch"
patch -d /opt/openresty/bundle/nginx-1.31.8 -p1 --forward -s <"/tmp/nginx-${commit}.patch"
rm -f "/tmp/nginx-${commit}.patch"
curl_with_retry "https://github.com/nginx/nginx/commit/${commit}.patch" "-" | patch -d /opt/openresty/bundle/nginx-1.31.8 -p1 --forward -s
done
msg_ok "Patched nginx HTTP/2"
+5
View File
@@ -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"