Bot Updating Package Versions

2026-03-03 00:43:34 +09:00 · 2022-07-21 07:32:51 +02:00 · 2022-07-14 07:34:38 +02:00 · 2022-07-08 12:46:30 +02:00 · 2022-07-08 05:37:38 -05:00 · 2022-07-07 21:01:12 -05:00
14 changed files with 248 additions and 130 deletions
--- a/8
+++ b/8
@@ -101,6 +101,7 @@ RUN \
  pip3 install -U --find-links https://wheel-index.linuxserver.io/alpine/ \
    ${CERTBOT} \
    certbot-dns-aliyun \
+    certbot-dns-azure \
    certbot-dns-cloudflare \
    certbot-dns-cloudxns \
    certbot-dns-cpanel \
@@ -118,6 +119,7 @@ RUN \
    certbot-dns-inwx \
    certbot-dns-ionos \
    certbot-dns-linode \
+    certbot-dns-loopia \
    certbot-dns-luadns \
    certbot-dns-netcup \
    certbot-dns-njalla \
@@ -125,12 +127,18 @@ RUN \
    certbot-dns-ovh \
    certbot-dns-rfc2136 \
    certbot-dns-route53 \
+    certbot-dns-standalone \
    certbot-dns-transip \
    certbot-dns-vultr \
    certbot-dns-desec \
    certbot-plugin-gandi \
    cryptography \
    requests && \
+  echo "**** correct ip6tables legacy issue ****" && \
+  rm \ 
+    /sbin/ip6tables && \
+  ln -s \
+    /sbin/ip6tables-nft /sbin/ip6tables && \
  echo "**** remove unnecessary fail2ban filters ****" && \
  rm \
    /etc/fail2ban/jail.d/alpine-ssh.conf && \
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -101,6 +101,7 @@ RUN \
  pip3 install -U --find-links https://wheel-index.linuxserver.io/alpine/ \
    ${CERTBOT} \
    certbot-dns-aliyun \
+    certbot-dns-azure \
    certbot-dns-cloudflare \
    certbot-dns-cloudxns \
    certbot-dns-cpanel \
@@ -118,6 +119,7 @@ RUN \
    certbot-dns-inwx \
    certbot-dns-ionos \
    certbot-dns-linode \
+    certbot-dns-loopia \
    certbot-dns-luadns \
    certbot-dns-netcup \
    certbot-dns-njalla \
@@ -125,12 +127,18 @@ RUN \
    certbot-dns-ovh \
    certbot-dns-rfc2136 \
    certbot-dns-route53 \
+    certbot-dns-standalone \
    certbot-dns-transip \
    certbot-dns-vultr \
    certbot-dns-desec \
    certbot-plugin-gandi \
    cryptography \
    requests && \
+  echo "**** correct ip6tables legacy issue ****" && \
+  rm \ 
+    /sbin/ip6tables && \
+  ln -s \
+    /sbin/ip6tables-nft /sbin/ip6tables && \
  echo "**** remove unnecessary fail2ban filters ****" && \
  rm \
    /etc/fail2ban/jail.d/alpine-ssh.conf && \
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -101,6 +101,7 @@ RUN \
  pip3 install -U --find-links https://wheel-index.linuxserver.io/alpine/ \
    ${CERTBOT} \
    certbot-dns-aliyun \
+    certbot-dns-azure \
    certbot-dns-cloudflare \
    certbot-dns-cloudxns \
    certbot-dns-cpanel \
@@ -118,6 +119,7 @@ RUN \
    certbot-dns-inwx \
    certbot-dns-ionos \
    certbot-dns-linode \
+    certbot-dns-loopia \
    certbot-dns-luadns \
    certbot-dns-netcup \
    certbot-dns-njalla \
@@ -125,11 +127,17 @@ RUN \
    certbot-dns-ovh \
    certbot-dns-rfc2136 \
    certbot-dns-route53 \
+    certbot-dns-standalone \
    certbot-dns-transip \
    certbot-dns-vultr \
    certbot-plugin-gandi \
    cryptography \
    requests && \
+  echo "**** correct ip6tables legacy issue ****" && \
+  rm \ 
+    /sbin/ip6tables && \
+  ln -s \
+    /sbin/ip6tables-nft /sbin/ip6tables && \
  echo "**** remove unnecessary fail2ban filters ****" && \
  rm \
    /etc/fail2ban/jail.d/alpine-ssh.conf && \
--- a/96
+++ b/96
@@ -118,12 +118,11 @@ pipeline {
            script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
            returnStdout: true).trim()

-          env.SEMVER = (new Date()).format('YYYY.MM.dd')
-          def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)$/
+          def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/
          if (semver.find()) {
            env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
          } else {
-            semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)$/
+            semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)/
            if (semver.find()) {
              if (semver[0][3]) {
                env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
@@ -133,7 +132,15 @@ pipeline {
            }
          }

-          println("SEMVER: ${env.SEMVER}")
+          if (env.SEMVER != null) {
+            if (BRANCH_NAME != "master" && BRANCH_NAME != "main") {
+              env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}"
+            }
+            println("SEMVER: ${env.SEMVER}")
+          } else {
+            println("No SEMVER detected")
+          }
+
        }
      }
    }
@@ -336,9 +343,11 @@ pipeline {
              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
                cd ${TEMPDIR}/unraid/templates/
                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
-                  echo "Image is on the ignore list, removing Unraid template"
-                  git rm unraid/${CONTAINER_NAME}.xml || :
-                  git commit -m 'Bot Removing Deprecated Unraid Template' || :
+                  echo "Image is on the ignore list, marking Unraid template as deprecated"
+                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
+                  git add -u unraid/${CONTAINER_NAME}.xml
+                  git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
+                  git commit -m 'Bot Moving Deprecated Unraid Template' || :
                else
                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                  git add unraid/${CONTAINER_NAME}.xml
@@ -402,10 +411,10 @@ pipeline {
      steps{
        sh '''#! /bin/bash
              set -e
-              PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/packages | jq -r '.[] | select(.name=="linuxserver/swag") | .uuid')
+              PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/swag") | .uuid')
              if [ -z "${PACKAGE_UUID}" ]; then
                echo "Adding package to Scarf.sh"
-                PACKAGE_UUID=$(curl -sX POST https://scarf.sh/api/v1/packages \
+                curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \
                  -H "Authorization: Bearer ${SCARF_TOKEN}" \
                  -H "Content-Type: application/json" \
                  -d '{"name":"linuxserver/swag",\
@@ -413,22 +422,10 @@ pipeline {
                       "libraryType":"docker",\
                       "website":"https://github.com/linuxserver/docker-swag",\
                       "backendUrl":"https://ghcr.io/linuxserver/swag",\
-                       "publicUrl":"https://lscr.io/linuxserver/swag"}' \
-                  | jq -r .uuid)
+                       "publicUrl":"https://lscr.io/linuxserver/swag"}' || :
              else
                echo "Package already exists on Scarf.sh"
              fi
-              echo "Setting permissions on Scarf.sh for package ${PACKAGE_UUID}"
-              curl -X POST https://scarf.sh/api/v1/packages/${PACKAGE_UUID}/permissions \
-                -H "Authorization: Bearer ${SCARF_TOKEN}" \
-                -H "Content-Type: application/json" \
-                -d '[{"userQuery":"Spad","permissionLevel":"admin"},\
-                     {"userQuery":"roxedus","permissionLevel":"admin"},\
-                     {"userQuery":"nemchik","permissionLevel":"admin"},\
-                     {"userQuery":"driz","permissionLevel":"admin"},\
-                     {"userQuery":"aptalca","permissionLevel":"admin"},\
-                     {"userQuery":"saarg","permissionLevel":"admin"},\
-                     {"userQuery":"Stark","permissionLevel":"admin"}]'
           '''
      } 
    }
@@ -752,11 +749,15 @@ pipeline {
                    docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
+                    if [ -n "${SEMVER}" ]; then
+                      docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
+                    fi
                    docker push ${PUSHIMAGE}:latest
                    docker push ${PUSHIMAGE}:${META_TAG}
                    docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                    docker push ${PUSHIMAGE}:${SEMVER}
+                    if [ -n "${SEMVER}" ]; then
+                     docker push ${PUSHIMAGE}:${SEMVER}
+                    fi
                  done
               '''
          }
@@ -765,8 +766,10 @@ pipeline {
                  docker rmi \
                  ${DELETEIMAGE}:${META_TAG} \
                  ${DELETEIMAGE}:${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:latest \
-                  ${DELETEIMAGE}:${SEMVER} || :
+                  ${DELETEIMAGE}:latest || :
+                  if [ -n "${SEMVER}" ]; then
+                    docker rmi ${DELETEIMAGE}:${SEMVER} || :
+                  fi
                done
             '''
        }
@@ -816,9 +819,11 @@ pipeline {
                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    if [ -n "${SEMVER}" ]; then
+                      docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
+                      docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
+                      docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    fi
                    docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
                    docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
@@ -828,9 +833,11 @@ pipeline {
                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
                    docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                    docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
-                    docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
-                    docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    if [ -n "${SEMVER}" ]; then
+                      docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
+                      docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
+                      docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    fi
                    docker manifest push --purge ${MANIFESTIMAGE}:latest || :
                    docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
                    docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
@@ -843,14 +850,18 @@ pipeline {
                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
-                    docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
-                    docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                    docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
-                    docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
+                    if [ -n "${SEMVER}" ]; then
+                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
+                      docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
+                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
+                    fi
                    docker manifest push --purge ${MANIFESTIMAGE}:latest
                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
-                    docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} 
+                    if [ -n "${SEMVER}" ]; then
+                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} 
+                    fi
                  done
               '''
          }
@@ -860,15 +871,18 @@ pipeline {
                  ${DELETEIMAGE}:amd64-${META_TAG} \
                  ${DELETEIMAGE}:amd64-latest \
                  ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:amd64-${SEMVER} \
                  ${DELETEIMAGE}:arm32v7-${META_TAG} \
                  ${DELETEIMAGE}:arm32v7-latest \
                  ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:arm32v7-${SEMVER} \
                  ${DELETEIMAGE}:arm64v8-${META_TAG} \
                  ${DELETEIMAGE}:arm64v8-latest \
-                  ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:arm64v8-${SEMVER} || :
+                  ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
+                  if [ -n "${SEMVER}" ]; then
+                    docker rmi \
+                    ${DELETEIMAGE}:amd64-${SEMVER} \
+                    ${DELETEIMAGE}:arm32v7-${SEMVER} \
+                    ${DELETEIMAGE}:arm64v8-${SEMVER} || :
+                  fi
                done
                docker rmi \
                ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
--- a/README.md
+++ b/README.md
@@ -29,6 +29,7 @@ Find us at:

 # [linuxserver/swag](https://github.com/linuxserver/docker-swag)

+[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fswag?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fswag)
 [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-swag.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-swag)
 [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-swag.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-swag/releases)
 [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-swag/packages)
@@ -45,17 +46,17 @@ SWAG - Secure Web Application Gateway (formerly known as letsencrypt, no relatio

 ## Supported Architectures

-Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
+We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).

-Simply pulling `lscr.io/linuxserver/swag` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `lscr.io/linuxserver/swag:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.

 The architectures supported by this image are:

-| Architecture | Tag |
-| :----: | --- |
-| x86-64 | amd64-latest |
-| arm64 | arm64v8-latest |
-| armhf | arm32v7-latest |
+| Architecture | Available | Tag |
+| :----: | :----: | ---- |
+| x86-64 | ✅ | amd64-\<version tag\> |
+| arm64 | ✅ | arm64v8-\<version tag\> |
+| armhf| ✅ | arm32v7-\<version tag\> |

 ## Application Setup

@@ -93,8 +94,8 @@ This will *ask* Google et al not to index and list your site. Be careful with th

 * This container includes auto-generated pfx and private-fullchain-bundle pem certs that are needed by other apps like Emby and Znc.
  * To use these certs in other containers, do either of the following:
-  1. *(Easier)* Mount the container's config folder in other containers (ie. `-v /path-to-le-config:/le-ssl`) and in the other containers, use the cert location `/le-ssl/keys/letsencrypt/`
-  2. *(More secure)* Mount the SWAG folder `etc` that resides under `/config` in other containers (ie. `-v /path-to-le-config/etc:/le-ssl`) and in the other containers, use the cert location `/le-ssl/letsencrypt/live/<your.domain.url>/` (This is more secure because the first method shares the entire SWAG config folder with other containers, including the www files, whereas the second method only shares the ssl certs)
+  1. *(Easier)* Mount the container's config folder in other containers (ie. `-v /path-to-swag-config:/swag-ssl`) and in the other containers, use the cert location `/swag-ssl/keys/letsencrypt/`
+  2. *(More secure)* Mount the SWAG folder `etc` that resides under `/config` in other containers (ie. `-v /path-to-swag-config/etc:/swag-ssl`) and in the other containers, use the cert location `/swag-ssl/letsencrypt/live/<your.domain.url>/` (This is more secure because the first method shares the entire SWAG config folder with other containers, including the www files, whereas the second method only shares the ssl certs)
  * These certs include:
  1. `cert.pem`, `chain.pem`, `fullchain.pem` and `privkey.pem`, which are generated by Certbot and used by nginx and various other apps
  2. `privkey.pfx`, a format supported by Microsoft and commonly used by dotnet apps such as Emby Server (no password)
@@ -102,11 +103,12 @@ This will *ask* Google et al not to index and list your site. Be careful with th

 ### Using fail2ban

-* This container includes fail2ban set up with 4 jails by default:
+* This container includes fail2ban set up with 5 jails by default:
  1. nginx-http-auth
  2. nginx-badbots
  3. nginx-botsearch
  4. nginx-deny
+  5. nginx-unauthorized
 * To enable or disable other jails, modify the file `/config/fail2ban/jail.local`
 * To modify filters and actions, instead of editing the `.conf` files, create `.local` files with the same name and edit those because .conf files get overwritten when the actions and filters are updated. `.local` files will append whatever's in the `.conf` files (ie. `nginx-http-auth.conf` --> `nginx-http-auth.local`)
 * You can check which jails are active via `docker exec -it swag fail2ban-client status`
@@ -142,7 +144,7 @@ Here are some example snippets to help you get started creating a container.
 version: "2.1"
 services:
  swag:
-    image: lscr.io/linuxserver/swag
+    image: lscr.io/linuxserver/swag:latest
    container_name: swag
    cap_add:
      - NET_ADMIN
@@ -193,7 +195,7 @@ docker run -d \
  -p 80:80 `#optional` \
  -v /path/to/appdata/config:/config \
  --restart unless-stopped \
-  lscr.io/linuxserver/swag
+  lscr.io/linuxserver/swag:latest
 ```

 ## Parameters
@@ -211,7 +213,7 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-e VALIDATION=http` | Certbot validation method to use, options are `http`, `dns` or `duckdns` (`dns` method also requires `DNSPLUGIN` variable set) (`duckdns` method requires `DUCKDNSTOKEN` variable set, and the `SUBDOMAINS` variable must be either empty or set to `wildcard`). |
 | `-e SUBDOMAINS=www,` | Subdomains you'd like the cert to cover (comma separated, no spaces) ie. `www,ftp,cloud`. For a wildcard cert, set this _exactly_ to `wildcard` (wildcard cert is available via `dns` and `duckdns` validation only) |
 | `-e CERTPROVIDER=` | Optionally define the cert provider. Set to `zerossl` for ZeroSSL certs (requires existing [ZeroSSL account](https://app.zerossl.com/signup) and the e-mail address entered in `EMAIL` env var). Otherwise defaults to Let's Encrypt. |
-| `-e DNSPLUGIN=cloudflare` | Required if `VALIDATION` is set to `dns`. Options are `aliyun`, `cloudflare`, `cloudxns`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `domeneshop`, `gandi`, `gehirn`, `google`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `rfc2136`, `route53`, `sakuracloud`, `transip` and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`. |
+| `-e DNSPLUGIN=cloudflare` | Required if `VALIDATION` is set to `dns`. Options are `aliyun`, `azure`, `cloudflare`, `cloudxns`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `domeneshop`, `gandi`, `gehirn`, `google`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `transip` and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`. |
 | `-e PROPAGATION=` | Optionally override (in seconds) the default propagation time for the dns plugins. |
 | `-e DUCKDNSTOKEN=` | Required if `VALIDATION` is set to `duckdns`. Retrieve your token from https://www.duckdns.org |
 | `-e EMAIL=` | Optional e-mail address used for cert expiration notifications (Required for ZeroSSL). |
@@ -220,6 +222,10 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-e STAGING=false` | Set to `true` to retrieve certs in staging mode. Rate limits will be much higher, but the resulting cert will not pass the browser's security test. Only to be used for testing purposes. |
 | `-v /config` | All the config files including the webroot reside here. |

+### Portainer notice
+
+This image utilises `cap_add` or `sysctl` to work properly. This is not implemented properly in some versions of Portainer, thus this image may not work if deployed through Portainer.
+
 ## Environment variables from files (Docker secrets)

 You can set any environment variable from a file by using a special prepend `FILE__`.
@@ -263,7 +269,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 * container version number
  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' swag`
 * image version number
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/swag`
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/swag:latest`

 ## Updating Info

@@ -281,7 +287,7 @@ Below are the instructions for updating containers:

 ### Via Docker Run

-* Update the image: `docker pull lscr.io/linuxserver/swag`
+* Update the image: `docker pull lscr.io/linuxserver/swag:latest`
 * Stop the running container: `docker stop swag`
 * Delete the container: `docker rm swag`
 * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
@@ -329,6 +335,12 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

+* **18.05.22:** - Added support for Azure DNS validation.
+* **09.04.22:** - Added certbot-dns-loopia for DNS01 validation.
+* **05.04.22:** - Added support for standalone DNS validation.
+* **28.03.22:** - created a logfile for fail2ban nginx-unauthorized in /etc/cont-init.d/50-config
+* **09.01.22:** - Added a fail2ban jail for nginx unauthorized
+* **21.12.21:** - Fixed issue with iptables not working as expected
 * **30.11.21:** - Move maxmind to a [new mod](https://github.com/linuxserver/docker-mods/tree/swag-maxmind)
 * **22.11.21:** - Added support for Infomaniak DNS for certificate generation.
 * **20.11.21:** - Added support for dnspod validation.
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -1,27 +1,27 @@
 alpine-baselayout-3.2.0-r16
 alpine-keys-2.4-r0
-apache2-utils-2.4.51-r0
+apache2-utils-2.4.54-r0
 apk-tools-2.12.7-r0
-apr-1.7.0-r0
+apr-1.7.0-r1
 apr-util-1.6.1-r7
 argon2-libs-20190702-r1
-bash-5.1.4-r0
+bash-5.1.16-r0
 brotli-libs-1.0.9-r5
-busybox-1.33.1-r6
+busybox-1.33.1-r8
 c-client-2007f-r11
-ca-certificates-20191127-r5
-ca-certificates-bundle-20191127-r5
+ca-certificates-20211220-r0
+ca-certificates-bundle-20211220-r0
 coreutils-8.32-r2
-curl-7.79.1-r0
-expat-2.4.1-r0
+curl-7.79.1-r2
+expat-2.4.7-r0
 fail2ban-0.11.2-r0
-freetype-2.10.4-r1
+freetype-2.10.4-r3
 gdbm-1.19-r0
-git-2.32.0-r0
-git-perl-2.32.0-r0
+git-2.32.3-r0
+git-perl-2.32.3-r0
 glib-2.68.3-r0
-gmp-6.2.1-r0
-gnupg-2.2.31-r0
+gmp-6.2.1-r1
+gnupg-2.2.31-r1
 gnutls-3.7.1-r0
 icu-libs-67.1-r2
 ip6tables-1.8.7-r1
@@ -29,13 +29,13 @@ iptables-1.8.7-r1
 libacl-2.2.53-r0
 libassuan-2.5.5-r0
 libattr-2.5.1-r0
-libblkid-2.37.2-r0
+libblkid-2.37.4-r0
 libbsd-0.11.3-r0
 libbz2-1.0.8-r1
 libc-utils-0.7.2-r3
 libcap-2.50-r0
-libcrypto1.1-1.1.1l-r0
-libcurl-7.79.1-r0
+libcrypto1.1-1.1.1q-r0
+libcurl-7.79.1-r2
 libedit-20210216.3.1-r0
 libevent-2.1.12-r2
 libffi-3.3-r2
@@ -55,76 +55,76 @@ libmcrypt-2.5.8-r9
 libmd-1.0.3-r0
 libmemcached-libs-1.0.18-r4
 libmnl-1.0.4-r1
-libmount-2.37.2-r0
+libmount-2.37.4-r0
 libnftnl-libs-1.2.0-r0
 libpng-1.6.37-r1
-libpq-13.5-r0
+libpq-13.7-r0
 libproc-3.3.17-r0
-libressl3.3-libcrypto-3.3.3-r0
-libressl3.3-libssl-3.3.3-r0
-libretls-3.3.3p1-r2
-libsasl-2.1.27-r12
+libressl3.3-libcrypto-3.3.6-r0
+libressl3.3-libssl-3.3.6-r0
+libretls-3.3.3p1-r3
+libsasl-2.1.28-r0
 libseccomp-2.5.1-r2
 libsecret-0.20.4-r1
 libsm-1.2.3-r0
 libsodium-1.0.18-r0
-libssl1.1-1.1.1l-r0
+libssl1.1-1.1.1q-r0
 libstdc++-10.3.1_git20210424-r2
 libtasn1-4.17.0-r0
 libunistring-0.9.10-r1
-libuuid-2.37.2-r0
+libuuid-2.37.4-r0
 libwebp-1.2.0-r2
 libx11-1.7.2-r0
 libxau-1.0.9-r0
 libxcb-1.14-r2
 libxdmcp-1.1.3-r0
 libxext-1.3.4-r0
-libxml2-2.9.12-r1
+libxml2-2.9.14-r0
 libxpm-3.5.13-r0
-libxslt-1.1.34-r1
+libxslt-1.1.35-r0
 libxt-1.2.1-r0
 libzip-1.7.3-r2
 linux-pam-1.5.1-r1
-logrotate-3.18.1-r0
-lz4-libs-1.9.3-r0
+logrotate-3.18.1-r3
+lz4-libs-1.9.3-r1
 memcached-1.6.9-r0
 mpdecimal-2.5.1-r1
 musl-1.2.2-r3
 musl-utils-1.2.2-r3
 nano-5.7-r2
-ncurses-libs-6.2_p20210612-r0
-ncurses-terminfo-base-6.2_p20210612-r0
+ncurses-libs-6.2_p20210612-r1
+ncurses-terminfo-base-6.2_p20210612-r1
 nettle-3.7.3-r0
 nghttp2-libs-1.43.0-r0
-nginx-1.20.2-r0
-nginx-mod-devel-kit-1.20.2-r0
-nginx-mod-http-brotli-1.20.2-r0
-nginx-mod-http-dav-ext-1.20.2-r0
-nginx-mod-http-echo-1.20.2-r0
-nginx-mod-http-fancyindex-1.20.2-r0
-nginx-mod-http-geoip2-1.20.2-r0
-nginx-mod-http-headers-more-1.20.2-r0
-nginx-mod-http-image-filter-1.20.2-r0
-nginx-mod-http-nchan-1.20.2-r0
-nginx-mod-http-perl-1.20.2-r0
-nginx-mod-http-redis2-1.20.2-r0
-nginx-mod-http-set-misc-1.20.2-r0
-nginx-mod-http-upload-progress-1.20.2-r0
-nginx-mod-http-xslt-filter-1.20.2-r0
-nginx-mod-mail-1.20.2-r0
-nginx-mod-rtmp-1.20.2-r0
-nginx-mod-stream-1.20.2-r0
-nginx-mod-stream-geoip2-1.20.2-r0
-nginx-vim-1.20.2-r0
+nginx-1.20.2-r1
+nginx-mod-devel-kit-1.20.2-r1
+nginx-mod-http-brotli-1.20.2-r1
+nginx-mod-http-dav-ext-1.20.2-r1
+nginx-mod-http-echo-1.20.2-r1
+nginx-mod-http-fancyindex-1.20.2-r1
+nginx-mod-http-geoip2-1.20.2-r1
+nginx-mod-http-headers-more-1.20.2-r1
+nginx-mod-http-image-filter-1.20.2-r1
+nginx-mod-http-nchan-1.20.2-r1
+nginx-mod-http-perl-1.20.2-r1
+nginx-mod-http-redis2-1.20.2-r1
+nginx-mod-http-set-misc-1.20.2-r1
+nginx-mod-http-upload-progress-1.20.2-r1
+nginx-mod-http-xslt-filter-1.20.2-r1
+nginx-mod-mail-1.20.2-r1
+nginx-mod-rtmp-1.20.2-r1
+nginx-mod-stream-1.20.2-r1
+nginx-mod-stream-geoip2-1.20.2-r1
+nginx-vim-1.20.2-r1
 npth-1.6-r0
 oniguruma-6.9.7.1-r0
-openssl-1.1.1l-r0
+openssl-1.1.1q-r0
 p11-kit-0.23.22-r0
 pcre-8.44-r0
-pcre2-10.36-r0
+pcre2-10.36-r1
 perl-5.32.1-r0
 perl-error-0.17029-r1
-perl-git-2.32.0-r0
+perl-git-2.32.3-r0
 php7-7.4.26-r0
 php7-bcmath-7.4.26-r0
 php7-bz2-7.4.26-r0
@@ -216,12 +216,12 @@ scanelf-1.3.2-r0
 shadow-4.8.1-r0
 skalibs-2.10.0.3-r0
 sqlite-libs-3.35.5-r0
-ssl_client-1.33.1-r6
-tzdata-2021e-r0
+ssl_client-1.33.1-r8
+tzdata-2022a-r0
 unixodbc-2.3.9-r1
 utmps-0.1.0.2-r0
 whois-5.5.10-r0
-xz-5.2.5-r0
-xz-libs-5.2.5-r0
-zlib-1.2.11-r3
+xz-5.2.5-r1
+xz-libs-5.2.5-r1
+zlib-1.2.12-r1
 zstd-libs-1.4.9-r1
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -51,7 +51,7 @@ opt_param_usage_include_env: true
 opt_param_env_vars:
  - { env_var: "SUBDOMAINS", env_value: "www,", desc: "Subdomains you'd like the cert to cover (comma separated, no spaces) ie. `www,ftp,cloud`. For a wildcard cert, set this _exactly_ to `wildcard` (wildcard cert is available via `dns` and `duckdns` validation only)" }
  - { env_var: "CERTPROVIDER", env_value: "", desc: "Optionally define the cert provider. Set to `zerossl` for ZeroSSL certs (requires existing [ZeroSSL account](https://app.zerossl.com/signup) and the e-mail address entered in `EMAIL` env var). Otherwise defaults to Let's Encrypt." }
-  - { env_var: "DNSPLUGIN", env_value: "cloudflare", desc: "Required if `VALIDATION` is set to `dns`. Options are `aliyun`, `cloudflare`, `cloudxns`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `domeneshop`, `gandi`, `gehirn`, `google`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `rfc2136`, `route53`, `sakuracloud`, `transip` and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`." }
+  - { env_var: "DNSPLUGIN", env_value: "cloudflare", desc: "Required if `VALIDATION` is set to `dns`. Options are `aliyun`, `azure`, `cloudflare`, `cloudxns`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `domeneshop`, `gandi`, `gehirn`, `google`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `transip` and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`." }
  - { env_var: "PROPAGATION", env_value: "", desc: "Optionally override (in seconds) the default propagation time for the dns plugins." }
  - { env_var: "DUCKDNSTOKEN", env_value: "", desc: "Required if `VALIDATION` is set to `duckdns`. Retrieve your token from https://www.duckdns.org" }
  - { env_var: "EMAIL", env_value: "", desc: "Optional e-mail address used for cert expiration notifications (Required for ZeroSSL)." }
@@ -111,8 +111,8 @@ app_setup_block: |

  * This container includes auto-generated pfx and private-fullchain-bundle pem certs that are needed by other apps like Emby and Znc.
    * To use these certs in other containers, do either of the following:
-    1. *(Easier)* Mount the container's config folder in other containers (ie. `-v /path-to-le-config:/le-ssl`) and in the other containers, use the cert location `/le-ssl/keys/letsencrypt/`
-    2. *(More secure)* Mount the SWAG folder `etc` that resides under `/config` in other containers (ie. `-v /path-to-le-config/etc:/le-ssl`) and in the other containers, use the cert location `/le-ssl/letsencrypt/live/<your.domain.url>/` (This is more secure because the first method shares the entire SWAG config folder with other containers, including the www files, whereas the second method only shares the ssl certs)
+    1. *(Easier)* Mount the container's config folder in other containers (ie. `-v /path-to-swag-config:/swag-ssl`) and in the other containers, use the cert location `/swag-ssl/keys/letsencrypt/`
+    2. *(More secure)* Mount the SWAG folder `etc` that resides under `/config` in other containers (ie. `-v /path-to-swag-config/etc:/swag-ssl`) and in the other containers, use the cert location `/swag-ssl/letsencrypt/live/<your.domain.url>/` (This is more secure because the first method shares the entire SWAG config folder with other containers, including the www files, whereas the second method only shares the ssl certs)
    * These certs include:
    1. `cert.pem`, `chain.pem`, `fullchain.pem` and `privkey.pem`, which are generated by Certbot and used by nginx and various other apps
    2. `privkey.pfx`, a format supported by Microsoft and commonly used by dotnet apps such as Emby Server (no password)
@@ -120,11 +120,12 @@ app_setup_block: |

  ### Using fail2ban

-  * This container includes fail2ban set up with 4 jails by default:
+  * This container includes fail2ban set up with 5 jails by default:
    1. nginx-http-auth
    2. nginx-badbots
    3. nginx-botsearch
    4. nginx-deny
+    5. nginx-unauthorized
  * To enable or disable other jails, modify the file `/config/fail2ban/jail.local`
  * To modify filters and actions, instead of editing the `.conf` files, create `.local` files with the same name and edit those because .conf files get overwritten when the actions and filters are updated. `.local` files will append whatever's in the `.conf` files (ie. `nginx-http-auth.conf` --> `nginx-http-auth.local`)
  * You can check which jails are active via `docker exec -it swag fail2ban-client status`
@@ -154,6 +155,12 @@ app_setup_nginx_reverse_proxy_block: ""

 # changelog
 changelogs:
+  - { date: "18.05.22:", desc: "Added support for Azure DNS validation." }
+  - { date: "09.04.22:", desc: "Added certbot-dns-loopia for DNS01 validation." }
+  - { date: "05.04.22:", desc: "Added support for standalone DNS validation." }
+  - { date: "28.03.22:", desc: "created a logfile for fail2ban nginx-unauthorized in /etc/cont-init.d/50-config" }
+  - { date: "09.01.22:", desc: "Added a fail2ban jail for nginx unauthorized" }
+  - { date: "21.12.21:", desc: "Fixed issue with iptables not working as expected" }
  - { date: "30.11.21:", desc: "Move maxmind to a [new mod](https://github.com/linuxserver/docker-mods/tree/swag-maxmind)" }
  - { date: "22.11.21:", desc: "Added support for Infomaniak DNS for certificate generation." }
  - { date: "20.11.21:", desc: "Added support for dnspod validation." }
--- a/root/defaults/dns-conf/azure.ini
+++ b/root/defaults/dns-conf/azure.ini
@@ -0,0 +1,26 @@
+# Instructions: https://certbot-dns-azure.readthedocs.io/en/latest/
+# Replace with your values
+# dns_azure_environment can be one of the following: AzurePublicCloud, AzureUSGovernmentCloud, AzureChinaCloud, AzureGermanCloud
+# Service Principal with Client Secret
+dns_azure_sp_client_id = 912ce44a-0156-4669-ae22-c16a17d34ca5
+dns_azure_sp_client_secret = E-xqXU83Y-jzTI6xe9fs2YC~mck3ZzUih9
+dns_azure_tenant_id = ed1090f3-ab18-4b12-816c-599af8a88cf7
+dns_azure_environment = "AzurePublicCloud"
+dns_azure_zone1 = example.com:/subscriptions/c135abce-d87d-48df-936c-15596c6968a5/resourceGroups/dns1
+
+
+# Service Prinicipal with Certificate
+#dns_azure_sp_client_id = 912ce44a-0156-4669-ae22-c16a17d34ca5
+#dns_azure_sp_certificate_path = /path/to/certificate.pem
+#dns_azure_tenant_id = ed1090f3-ab18-4b12-816c-599af8a88cf7
+#dns_azure_environment = "AzurePublicCloud"
+#dns_azure_zone1 = example.com:/subscriptions/c135abce-d87d-48df-936c-15596c6968a5/resourceGroups/dns1
+
+# Azure Managed Identity
+#dns_azure_msi_client_id = 912ce44a-0156-4669-ae22-c16a17d34ca5
+#dns_azure_zone1 = example.com:/subscriptions/c135abce-d87d-48df-936c-15596c6968a5/resourceGroups/dns1
+
+# System Assigned Azure Managed Identity
+#dns_azure_msi_system_assigned = true
+#dns_azure_environment = "AzurePublicCloud"
+#dns_azure_zone1 = example.com:/subscriptions/c135abce-d87d-48df-936c-15596c6968a5/resourceGroups/dns1
--- a/root/defaults/dns-conf/loopia.ini
+++ b/root/defaults/dns-conf/loopia.ini
@@ -0,0 +1,3 @@
+# Replace with your values
+dns_loopia_user = user@loopiaapi
+dns_loopia_password = passwordgoeshere
--- a/root/defaults/dns-conf/standalone.ini
+++ b/root/defaults/dns-conf/standalone.ini
@@ -0,0 +1,8 @@
+# Instructions: https://github.com/siilike/certbot-dns-standalone/blob/master/README.rst
+# Make sure to expose UDP port 53 from your swag container:
+# - for docker cli, add argument: `-p 53:53/udp`
+# - for docker-compose, add the following line under ports: `- 53:53/udp`
+# This file does not need to be changed:
+# - no credentials are required
+# - it's not used and only for informational purpose
+# - prepare the correct DNS records as described in the plugin instructions instead
--- a/root/defaults/fail2ban/filter.d/nginx-unauthorized.conf
+++ b/root/defaults/fail2ban/filter.d/nginx-unauthorized.conf
@@ -0,0 +1,7 @@
+# A fail2ban filter for unauthorized log messages
+
+[Definition]
+
+failregex = ^(?!.*?(?i)plex)<HOST>.*"(GET|POST|HEAD).*" 401 .*$
+
+ignoreregex = 
--- a/root/defaults/jail.local
+++ b/root/defaults/jail.local
@@ -1,10 +1,14 @@
-## Version 2020/05/10 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/jail.local
+## Version 2022/01/09 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/jail.local
 # This is the custom version of the jail.conf for fail2ban
 # Feel free to modify this and add additional filters
 # Then you can drop the new filter conf files into the fail2ban-filters
 # folder and restart the container

 [DEFAULT]
+# Prevents banning LAN subnets
+ignoreip = 10.0.0.0/8
+           192.168.0.0/16
+           172.16.0.0/12

 # Changes the default ban action from "iptables-multiport", which causes issues on some platforms, to "iptables-allports".
 banaction = iptables-allports
@@ -21,37 +25,35 @@ maxretry = 5


 [ssh]
-
 enabled = false

-
 [nginx-http-auth]
-
 enabled  = true
 filter   = nginx-http-auth
 port     = http,https
 logpath  = /config/log/nginx/error.log

-
 [nginx-badbots]
-
 enabled  = true
 port     = http,https
 filter   = nginx-badbots
 logpath  = /config/log/nginx/access.log
 maxretry = 2

-
 [nginx-botsearch]
-
 enabled  = true
 port     = http,https
 filter   = nginx-botsearch
 logpath  = /config/log/nginx/access.log

 [nginx-deny]
-
 enabled  = true
 port     = http,https
 filter   = nginx-deny
 logpath  = /config/log/nginx/error.log
+
+[nginx-unauthorized]
+enabled  = true
+port     = http,https
+filter   = nginx-unauthorized
+logpath  = /config/log/nginx/unauthorized.log
--- a/root/defaults/nginx.conf
+++ b/root/defaults/nginx.conf
@@ -1,4 +1,4 @@
-## Version 2021/04/27 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx.conf
+## Version 2022/01/09 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx.conf

 user abc;

@@ -55,6 +55,13 @@ http {
        '' close;
    }

+    # Saves unauthorized log messages to a separate log file
+    map $status $unauthorized {
+        default 0;
+        ~^401  1;
+    }
+    access_log /config/log/nginx/unauthorized.log combined if=$unauthorized;
+    
    # Sets the path, format, and configuration for a buffered log write.
    access_log /config/log/nginx/access.log;

--- a/root/etc/cont-init.d/50-config
+++ b/root/etc/cont-init.d/50-config
@@ -120,7 +120,7 @@ if ! grep -q 'PARAMETERS' "/config/nginx/dhparams.pem"; then
 fi

 # check to make sure DNSPLUGIN is selected if dns validation is used
-[[ "$VALIDATION" = "dns" ]] && [[ ! "$DNSPLUGIN" =~ ^(aliyun|cloudflare|cloudxns|cpanel|desec|digitalocean|directadmin|dnsimple|dnsmadeeasy|dnspod|domeneshop|gandi|gehirn|google|he|hetzner|infomaniak|inwx|ionos|linode|luadns|netcup|njalla|nsone|ovh|rfc2136|route53|sakuracloud|transip|vultr)$ ]] && \
+[[ "$VALIDATION" = "dns" ]] && [[ ! "$DNSPLUGIN" =~ ^(aliyun|azure|cloudflare|cloudxns|cpanel|desec|digitalocean|directadmin|dnsimple|dnsmadeeasy|dnspod|domeneshop|gandi|gehirn|google|he|hetzner|infomaniak|inwx|ionos|linode|loopia|luadns|netcup|njalla|nsone|ovh|rfc2136|route53|sakuracloud|standalone|transip|vultr)$ ]] && \
    echo "Please set the DNSPLUGIN variable to a valid plugin name. See docker info for more details." && \
    sleep infinity

@@ -234,12 +234,18 @@ if [ "$VALIDATION" = "dns" ]; then
    elif [[ "$DNSPLUGIN" =~ ^(google)$ ]]; then
        if [ -n "$PROPAGATION" ];then PROPAGATIONPARAM="--dns-${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi
        PREFCHAL="--dns-${DNSPLUGIN} --dns-${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.json ${PROPAGATIONPARAM}"
-    elif [[ "$DNSPLUGIN" =~ ^(aliyun|desec|dnspod|domeneshop|he|hetzner|infomaniak|inwx|ionos|netcup|njalla|transip|vultr)$ ]]; then
+    elif [[ "$DNSPLUGIN" =~ ^(aliyun|desec|dnspod|domeneshop|he|hetzner|infomaniak|inwx|ionos|loopia|netcup|njalla|transip|vultr)$ ]]; then
        if [ -n "$PROPAGATION" ];then PROPAGATIONPARAM="--dns-${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi
        PREFCHAL="-a dns-${DNSPLUGIN} --dns-${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.ini ${PROPAGATIONPARAM}"
+    elif [[ "$DNSPLUGIN" =~ ^(standalone)$ ]]; then
+        if [ -n "$PROPAGATION" ];then echo "standalone dns plugin does not support setting propagation time"; fi
+        PREFCHAL="-a dns-${DNSPLUGIN}"
    elif [[ "$DNSPLUGIN" =~ ^(directadmin)$ ]]; then
        if [ -n "$PROPAGATION" ];then PROPAGATIONPARAM="--${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi
        PREFCHAL="-a ${DNSPLUGIN} --${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.ini ${PROPAGATIONPARAM}"
+    elif [[ "$DNSPLUGIN" =~ ^(azure)$ ]]; then
+        if [ -n "$PROPAGATION" ];then echo "Azure dns plugin does not support setting propagation time"; fi
+        PREFCHAL="-a dns-${DNSPLUGIN} --dns-${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.ini"
    else
        if [ -n "$PROPAGATION" ];then PROPAGATIONPARAM="--dns-${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi
        PREFCHAL="--dns-${DNSPLUGIN} --dns-${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.ini ${PROPAGATIONPARAM}"
@@ -366,6 +372,8 @@ fi
    touch /config/log/nginx/error.log
 [[ ! -f /config/log/nginx/access.log ]] && \
    touch /config/log/nginx/access.log
+[[ ! -f /config/log/nginx/unauthorized.log ]] && \
+    touch /config/log/nginx/unauthorized.log

 # permissions
 chown -R abc:abc \
Author	SHA1	Message	Date
LinuxServer-CI	4864761b54	Bot Updating Package Versions	2022-07-21 07:32:51 +02:00
LinuxServer-CI	3d70935ecf	Bot Updating Package Versions	2022-07-14 07:34:38 +02:00
LinuxServer-CI	e5b672e52b	Bot Updating Package Versions	2022-07-08 12:46:30 +02:00
Eric Nemchik	1adf35b5df	Merge pull request #246 from linuxserver/minor-readme-update Minor readme update	2022-07-08 05:37:38 -05:00
Eric Nemchik	c279c173b3	Minor readme update	2022-07-07 21:01:12 -05:00
LinuxServer-CI	8ed7c7ee28	Bot Updating Package Versions	2022-07-06 23:02:12 +02:00
LinuxServer-CI	1f42c02a4a	Bot Updating Package Versions	2022-06-23 00:25:18 -05:00
LinuxServer-CI	37b5af4856	Bot Updating Package Versions	2022-06-16 00:22:29 -05:00
LinuxServer-CI	016dc18007	Bot Updating Package Versions	2022-06-07 21:51:48 -05:00
LinuxServer-CI	dd034ef3c1	Bot Updating Package Versions	2022-06-02 07:35:33 +02:00
LinuxServer-CI	0069f887a7	Bot Updating Package Versions	2022-05-26 07:25:29 +02:00
aptalca	623e99c6ab	Merge pull request #234 from linuxserver/azure fix azure dns	2022-05-18 09:48:23 -04:00
aptalca	996d3b26df	fix azure dns	2022-05-18 09:32:44 -04:00
LinuxServer-CI	252d57cf34	Bot Updating Package Versions	2022-05-18 10:54:23 +02:00
LinuxServer-CI	4b486b547c	Bot Updating Templated Files	2022-05-18 10:50:45 +02:00
Roxedus	ef95db397b	Merge pull request #217 from RobinDadswell/azureDNSSupport	2022-05-18 01:49:25 -07:00
LinuxServer-CI	0bb1f55280	Bot Updating Package Versions	2022-05-12 07:29:01 +02:00
LinuxServer-CI	5df55cc0c0	Bot Updating Package Versions	2022-05-03 17:59:50 -05:00
LinuxServer-CI	ceabef087f	Bot Updating Templated Files	2022-05-04 00:55:45 +02:00
LinuxServer-CI	6f9ed0721d	Bot Updating Templated Files	2022-05-04 00:54:37 +02:00
LinuxServer-CI	5319c88dfa	Bot Updating Package Versions	2022-04-28 00:43:35 -05:00
LinuxServer-CI	c875b69297	Bot Updating Package Versions	2022-04-21 00:41:17 -05:00
Robin Dadswell	3893db4077	New: Azure DNS support	2022-04-17 22:09:14 +01:00
LinuxServer-CI	f8e4eca8d0	Bot Updating Package Versions	2022-04-14 07:20:07 +02:00
LinuxServer-CI	ee6a7d454f	Bot Updating Package Versions	2022-04-09 11:21:10 -05:00
LinuxServer-CI	f29ae615d4	Bot Updating Templated Files	2022-04-09 11:15:55 -05:00
Potterer	a9fd11ff77	Add Loopia DNS Support (#226 )	2022-04-09 17:14:35 +01:00
LinuxServer-CI	60c0da359b	Bot Updating Templated Files	2022-04-05 21:55:48 -05:00
aptalca	bec249ba73	Merge pull request #179 from mhofer117/standalone-dns-validation Add support for standalone DNS validation	2022-04-05 19:13:42 -04:00
aptalca	eb7df9d9fc	Merge branch 'master' into standalone-dns-validation	2022-04-05 19:08:28 -04:00
aptalca	a29f2da10e	update changelog date	2022-04-05 19:06:43 -04:00
LinuxServer-CI	a9e53d5fc8	Bot Updating Package Versions	2022-04-05 21:56:51 +02:00
quietsy	f9e05fd86a	Merge pull request #219 from EVOTk/patch-1 add nginx unauthorized in Using fail2ban section	2022-03-31 20:59:57 +00:00
LinuxServer-CI	b28eed1263	Bot Updating Package Versions	2022-03-28 16:40:46 -05:00
LinuxServer-CI	7eb8f7999e	Bot Updating Templated Files	2022-03-28 16:35:42 -05:00
aptalca	5beb4ffb32	Merge pull request #223 from millerthegorilla/unauthorized-log-patch-1 Update 50-config create fail2ban unauthorized.log	2022-03-28 17:34:11 -04:00
James Stewart Miller	9821740d65	Update readme-vars.yml added changelog	2022-03-28 21:57:19 +01:00
James Stewart Miller	5501308aed	Update 50-config create fail2ban unauthorized.log added code to test for existence of unauthorized.log and create it if not exists. /config/log/nginx/unauthorized.log is written to by addition of nginx-unauthorized jail in jail.local at (https://github.com/linuxserver/docker-swag/blob/master/root/defaults/jail.local)	2022-03-26 20:46:39 +00:00
EVOTk	2272c3037a	Update readme-vars.yml	2022-03-25 22:51:17 +01:00
LinuxServer-CI	cf8cfd4241	Bot Updating Package Versions	2022-03-24 06:19:17 +01:00
LinuxServer-CI	a5389c3f40	Bot Updating Package Versions	2022-03-16 21:57:12 +01:00
LinuxServer-CI	1fbae23bcf	Bot Updating Package Versions	2022-03-10 06:19:39 +01:00
EVOTk	de3b43cb62	add nginx unauthorized in Using fail2ban section	2022-03-09 21:59:49 +01:00
LinuxServer-CI	555b2837cb	Bot Updating Package Versions	2022-03-02 00:56:48 +01:00
LinuxServer-CI	7c5005f9ad	Bot Updating Package Versions	2022-02-24 06:18:30 +01:00
LinuxServer-CI	7fb7364c96	Bot Updating Package Versions	2022-02-17 06:18:01 +01:00
LinuxServer-CI	274369c4ba	Bot Updating Package Versions	2022-02-08 19:58:44 +01:00
LinuxServer-CI	7562a1c26a	Bot Updating Package Versions	2022-02-03 06:18:15 +01:00
LinuxServer-CI	7d6b5e66c1	Bot Updating Package Versions	2022-01-27 06:19:02 +01:00
LinuxServer-CI	6fde2f5f8f	Bot Updating Package Versions	2022-01-20 06:19:07 +01:00
Roxedus	08d0680a0c	Merge pull request #202 from quietsy/master	2022-01-11 08:34:43 +01:00
quietsy	665eace79f	Ignore plex unauthorized requests	2022-01-11 09:19:16 +02:00
Roxedus	51d6132d63	Merge pull request #201 from quietsy/master	2022-01-10 19:48:30 +01:00
quietsy	251917b23f	Added a fail2ban jail for nginx unauthorized	2022-01-09 17:16:11 +02:00
LinuxServer-CI	bedff470cf	Bot Updating Package Versions	2021-12-30 06:19:44 +01:00
driz	84cdf58b66	Merge pull request #196 from linuxserver/ipv6-fix replace ip6tables legacy with ip6tables-nft due to missing kernel module	2021-12-21 17:27:47 -05:00
drizuid	e843b50fc8	replace ip6tables legacy with ip6tables-nft due to missing kernel module	2021-12-21 14:40:37 -05:00
Marcel Hofer	1ff4691000	Merge branch 'master' into standalone-dns-validation	2021-12-12 01:06:20 +01:00
LinuxServer-CI	682689d0fc	Bot Updating Package Versions	2021-12-09 06:19:24 +01:00
Marcel Hofer	2878d84050	Merge remote-tracking branch 'linuxserver/master' into standalone-dns-validation # Conflicts: # readme-vars.yml # root/etc/cont-init.d/50-config	2021-11-24 22:02:24 +01:00
Marcel Hofer	85efd12ba4	Merge branch 'master' into standalone-dns-validation	2021-11-20 19:47:43 +01:00
Marcel Hofer	f307dbbfb7	Merge branch 'master' into standalone-dns-validation	2021-11-16 21:12:06 +01:00
Marcel Hofer	0ce2ae551a	Add support for standalone DNS validation	2021-11-06 16:07:51 +01:00