From f85e82973da5d6f8689a06d0572ec1b71f86208d Mon Sep 17 00:00:00 2001 From: cui fliter Date: Sat, 10 Sep 2022 21:08:16 +0800 Subject: [PATCH 1/5] all: fix some typos Signed-off-by: cui fliter --- docker/rootfs/etc/cont-init.d/01_s6-secret-init.sh | 2 +- docs/third-party/README.md | 2 +- scripts/docs-upload | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/rootfs/etc/cont-init.d/01_s6-secret-init.sh b/docker/rootfs/etc/cont-init.d/01_s6-secret-init.sh index f145807..7a2e2d0 100644 --- a/docker/rootfs/etc/cont-init.d/01_s6-secret-init.sh +++ b/docker/rootfs/etc/cont-init.d/01_s6-secret-init.sh @@ -2,7 +2,7 @@ # ref: https://github.com/linuxserver/docker-baseimage-alpine/blob/master/root/etc/cont-init.d/01-envfile # in s6, environmental variables are written as text files for s6 to monitor -# seach through full-path filenames for files ending in "__FILE" +# search through full-path filenames for files ending in "__FILE" for FILENAME in $(find /var/run/s6/container_environment/ | grep "__FILE$"); do echo "[secret-init] Evaluating ${FILENAME##*/} ..." diff --git a/docs/third-party/README.md b/docs/third-party/README.md index 9b533ef..2961f34 100644 --- a/docs/third-party/README.md +++ b/docs/third-party/README.md @@ -1,6 +1,6 @@ # Third Party -As this software gains popularity it's common to see it integrated with other platforms. Please be aware that unless specifically mentioned in the documenation of those +As this software gains popularity it's common to see it integrated with other platforms. Please be aware that unless specifically mentioned in the documentation of those integrations, they are *not supported* by me. Known integrations: diff --git a/scripts/docs-upload b/scripts/docs-upload index ea71fb8..75d44a6 100755 --- a/scripts/docs-upload +++ b/scripts/docs-upload @@ -12,7 +12,7 @@ ALL_FILES=$(find . -follow) for FILE in $ALL_FILES do - # remove preceeding ./ + # remove preceding ./ FILE=$(echo "$FILE" | sed -E "s/\.\///g") echo '=======================================' echo "FILE: $FILE" From d73a246b6688c2fe502ac3b980a94805535e91cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20B=C3=B8e=20Andreassen?= Date: Wed, 28 Sep 2022 11:48:31 +0200 Subject: [PATCH 2/5] Added Domeneshop certbot dns plugin --- global/certbot-dns-plugins.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/global/certbot-dns-plugins.js b/global/certbot-dns-plugins.js index 60f3923..354e4db 100644 --- a/global/certbot-dns-plugins.js +++ b/global/certbot-dns-plugins.js @@ -202,6 +202,16 @@ dns_dnspod_api_token = "id,key"`, full_plugin_name: 'dns-dnspod', }, //####################################################// + domeneshop: { + display_name: 'Domeneshop', + package_name: 'certbot-dns-domeneshop', + version_requirement: '~=0.2.8', + dependencies: '', + credentials: `dns_domeneshop_client_token=YOUR_DOMENESHOP_CLIENT_TOKEN +dns_domeneshop_client_secret=YOUR_DOMENESHOP_CLIENT_SECRET`, + full_plugin_name: 'dns-domeneshop', + }, + //####################################################// dynu: { display_name: 'Dynu', package_name: 'certbot-dns-dynu', From 837f4dcbd433881735b3c1c9371cc2ce4679d0c5 Mon Sep 17 00:00:00 2001 From: Austin Date: Sun, 2 Oct 2022 05:05:46 +0000 Subject: [PATCH 3/5] Update for docker-compose-plugin command --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index a97d3ba..1f81ca3 100644 --- a/README.md +++ b/README.md @@ -80,6 +80,10 @@ services: ```bash docker-compose up -d + +# If using docker-compose-plugin +docker compose up -d + ``` 4. Log in to the Admin UI From e77b13d36e02234843c68bf39bab49ad4489cdca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Jan=20Czocha=C5=84ski?= Date: Thu, 20 Oct 2022 06:57:56 +0200 Subject: [PATCH 4/5] Fix DISABLE_IPV6 flag handling The DISABLE_IPV6 flag did not turn off ipv6 DNS requests performed by nginx. This commit changes it and makes nginx-proxy-manager more compatible with podman. --- docker/rootfs/etc/services.d/nginx/run | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docker/rootfs/etc/services.d/nginx/run b/docker/rootfs/etc/services.d/nginx/run index 51ca5ea..b5b66f0 100755 --- a/docker/rootfs/etc/services.d/nginx/run +++ b/docker/rootfs/etc/services.d/nginx/run @@ -24,8 +24,12 @@ chown root /tmp/nginx # Dynamically generate resolvers file, if resolver is IPv6, enclose in `[]` # thanks @tfmm -echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" { sub(/%.*$/,"",$2); print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf) valid=10s;" > /etc/nginx/conf.d/include/resolvers.conf - +if [ "$DISABLE_IPV6" == "true" ] || [ "$DISABLE_IPV6" == "on" ] || [ "$DISABLE_IPV6" == "1" ] || [ "$DISABLE_IPV6" == "yes" ]; +then + echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" { sub(/%.*$/,"",$2); print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf) ipv6=off valid=10s;" > /etc/nginx/conf.d/include/resolvers.conf +else + echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" { sub(/%.*$/,"",$2); print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf) valid=10s;" > /etc/nginx/conf.d/include/resolvers.conf +fi # Generate dummy self-signed certificate. if [ ! -f /data/nginx/dummycert.pem ] || [ ! -f /data/nginx/dummykey.pem ] then From 03b544023b4babb3d22907942a92c130e751544d Mon Sep 17 00:00:00 2001 From: ROVAST Date: Wed, 2 Nov 2022 10:26:01 +0800 Subject: [PATCH 5/5] Update README.md Fix docker compose up warning message ``` WARN[0000] network default: network.external.name is deprecated in favor of network.name ``` --- docs/advanced-config/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/advanced-config/README.md b/docs/advanced-config/README.md index c7b51a8..78b9654 100644 --- a/docs/advanced-config/README.md +++ b/docs/advanced-config/README.md @@ -18,8 +18,8 @@ services running on this Docker host: ```yml networks: default: - external: - name: scoobydoo + external: true + name: scoobydoo ``` Let's look at a Portainer example: @@ -38,8 +38,8 @@ services: networks: default: - external: - name: scoobydoo + external: true + name: scoobydoo ``` Now in the NPM UI you can create a proxy host with `portainer` as the hostname,