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 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/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 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, 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/global/certbot-dns-plugins.js b/global/certbot-dns-plugins.js index dd38849..402d651 100644 --- a/global/certbot-dns-plugins.js +++ b/global/certbot-dns-plugins.js @@ -209,6 +209,16 @@ dns_dnspod_api_token = "id,key"`, dependencies: '', credentials: 'dns_do_api_token = YOUR_DO_DE_AUTH_TOKEN', full_plugin_name: 'dns-do', + }, + //####################################################// + 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: { 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"