Bot Updating Package Versions

avoid rust for py crypto

Dockerfile

@@ -9,7 +9,7 @@ LABEL maintainer="aptalca"
 
 # environment settings
 ENV DHLEVEL=2048 ONLY_SUBDOMAINS=false AWS_CONFIG_FILE=/config/dns-conf/route53.ini
-ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
+ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 CRYPTOGRAPHY_DONT_BUILD_RUST=true
 
 RUN \
  echo "**** install build packages ****" && \
@@ -104,6 +104,7 @@ RUN \
 	certbot-dns-dnsmadeeasy \
 	certbot-dns-domeneshop \
 	certbot-dns-google \
+	certbot-dns-hetzner \
 	certbot-dns-inwx \
 	certbot-dns-linode \
 	certbot-dns-luadns \

Dockerfile.aarch64

@@ -9,7 +9,7 @@ LABEL maintainer="aptalca"
 
 # environment settings
 ENV DHLEVEL=2048 ONLY_SUBDOMAINS=false AWS_CONFIG_FILE=/config/dns-conf/route53.ini
-ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
+ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 CRYPTOGRAPHY_DONT_BUILD_RUST=true
 
 RUN \
  echo "**** install build packages ****" && \
@@ -104,6 +104,7 @@ RUN \
 	certbot-dns-dnsmadeeasy \
 	certbot-dns-domeneshop \
 	certbot-dns-google \
+	certbot-dns-hetzner \
 	certbot-dns-inwx \
 	certbot-dns-linode \
 	certbot-dns-luadns \

Dockerfile.armhf

@@ -9,7 +9,7 @@ LABEL maintainer="aptalca"
 
 # environment settings
 ENV DHLEVEL=2048 ONLY_SUBDOMAINS=false AWS_CONFIG_FILE=/config/dns-conf/route53.ini
-ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
+ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 CRYPTOGRAPHY_DONT_BUILD_RUST=true
 
 RUN \
  echo "**** install build packages ****" && \
@@ -104,6 +104,7 @@ RUN \
 	certbot-dns-dnsmadeeasy \
 	certbot-dns-domeneshop \
 	certbot-dns-google \
+	certbot-dns-hetzner \
 	certbot-dns-inwx \
 	certbot-dns-linode \
 	certbot-dns-luadns \

README.md

@@ -142,7 +142,7 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-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 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 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`, `digitalocean`, `dnsimple`, `dnsmadeeasy`, `domeneshop`, `gandi`, `gehirn`, `google`, `inwx`, `linode`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `rfc2136`, `route53`, `sakuracloud` and `transip`. 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`, `cloudflare`, `cloudxns`, `cpanel`, `digitalocean`, `dnsimple`, `dnsmadeeasy`, `domeneshop`, `gandi`, `gehirn`, `google`, `hetzner`, `inwx`, `linode`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `rfc2136`, `route53`, `sakuracloud` and `transip`. 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). |
@@ -326,6 +326,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **26.01.21:** - Add support for hetzner dns validation.
 * **20.01.21:** - Add check for ZeroSSL EAB retrieval.
 * **08.01.21:** - Add support for getting certs from [ZeroSSL](https://zerossl.com/) via optional `CERTPROVIDER` env var. Update aliyun, domeneshop, inxw and transip dns plugins with the new plugin names. Hide `donoteditthisfile.conf` because users were editing it despite its name. Suppress harmless error when no proxy confs are enabled.
 * **03.01.21:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) /config/nginx/site-confs/default - Add helper pages to aid troubleshooting

package_versions.txt

@@ -63,7 +63,7 @@ libproc-3.3.16-r0
 libressl3.1-libcrypto-3.1.2-r0
 libressl3.1-libssl-3.1.2-r0
 libsasl-2.1.27-r6
-libseccomp-2.4.3-r0
+libseccomp-2.4.4-r0
 libsecret-0.20.3-r0
 libsm-1.2.3-r0
 libsodium-1.0.18-r0
@@ -123,55 +123,55 @@ pcre2-10.35-r0
 perl-5.30.3-r0
 perl-error-0.17029-r0
 perl-git-2.26.2-r0
-php7-7.3.26-r0
-php7-bcmath-7.3.26-r0
-php7-bz2-7.3.26-r0
-php7-common-7.3.26-r0
-php7-ctype-7.3.26-r0
-php7-curl-7.3.26-r0
-php7-dom-7.3.26-r0
-php7-exif-7.3.26-r0
+php7-7.3.27-r0
+php7-bcmath-7.3.27-r0
+php7-bz2-7.3.27-r0
+php7-common-7.3.27-r0
+php7-ctype-7.3.27-r0
+php7-curl-7.3.27-r0
+php7-dom-7.3.27-r0
+php7-exif-7.3.27-r0
 php7-fileinfo-7.3.26-r0
 php7-fpm-7.3.26-r0
-php7-ftp-7.3.26-r0
-php7-gd-7.3.26-r0
-php7-iconv-7.3.26-r0
-php7-imap-7.3.26-r0
-php7-intl-7.3.26-r0
-php7-json-7.3.26-r0
-php7-ldap-7.3.26-r0
-php7-mbstring-7.3.26-r0
-php7-mysqli-7.3.26-r0
-php7-mysqlnd-7.3.26-r0
-php7-opcache-7.3.26-r0
-php7-openssl-7.3.26-r0
-php7-pdo-7.3.26-r0
-php7-pdo_mysql-7.3.26-r0
-php7-pdo_odbc-7.3.26-r0
-php7-pdo_pgsql-7.3.26-r0
-php7-pdo_sqlite-7.3.26-r0
-php7-pear-7.3.26-r0
+php7-ftp-7.3.27-r0
+php7-gd-7.3.27-r0
+php7-iconv-7.3.27-r0
+php7-imap-7.3.27-r0
+php7-intl-7.3.27-r0
+php7-json-7.3.27-r0
+php7-ldap-7.3.27-r0
+php7-mbstring-7.3.27-r0
+php7-mysqli-7.3.27-r0
+php7-mysqlnd-7.3.27-r0
+php7-opcache-7.3.27-r0
+php7-openssl-7.3.27-r0
+php7-pdo-7.3.27-r0
+php7-pdo_mysql-7.3.27-r0
+php7-pdo_odbc-7.3.27-r0
+php7-pdo_pgsql-7.3.27-r0
+php7-pdo_sqlite-7.3.27-r0
+php7-pear-7.3.27-r0
 php7-pecl-apcu-5.1.19-r0
 php7-pecl-igbinary-3.1.6-r0
 php7-pecl-mcrypt-1.0.3-r0
 php7-pecl-memcached-3.1.5-r0
 php7-pecl-redis-5.2.2-r1
-php7-pgsql-7.3.26-r0
-php7-phar-7.3.26-r0
-php7-posix-7.3.26-r0
-php7-session-7.3.26-r0
+php7-pgsql-7.3.27-r0
+php7-phar-7.3.27-r0
+php7-posix-7.3.27-r0
+php7-session-7.3.27-r0
 php7-simplexml-7.3.26-r0
-php7-soap-7.3.26-r0
-php7-sockets-7.3.26-r0
-php7-sodium-7.3.26-r0
-php7-sqlite3-7.3.26-r0
-php7-tokenizer-7.3.26-r0
-php7-xml-7.3.26-r0
-php7-xmlreader-7.3.26-r0
-php7-xmlrpc-7.3.26-r0
+php7-soap-7.3.27-r0
+php7-sockets-7.3.27-r0
+php7-sodium-7.3.27-r0
+php7-sqlite3-7.3.27-r0
+php7-tokenizer-7.3.27-r0
+php7-xml-7.3.27-r0
+php7-xmlreader-7.3.27-r0
+php7-xmlrpc-7.3.27-r0
 php7-xmlwriter-7.3.26-r0
-php7-xsl-7.3.26-r0
-php7-zip-7.3.26-r0
+php7-xsl-7.3.27-r0
+php7-zip-7.3.27-r0
 pinentry-1.1.0-r2
 popt-1.16-r7
 procps-3.3.16-r0

readme-vars.yml

@@ -51,7 +51,7 @@ cap_add_param_vars:
 opt_param_usage_include_env: true
 opt_param_env_vars:
   - { 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`, `digitalocean`, `dnsimple`, `dnsmadeeasy`, `domeneshop`, `gandi`, `gehirn`, `google`, `inwx`, `linode`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `rfc2136`, `route53`, `sakuracloud` and `transip`. 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`, `cloudflare`, `cloudxns`, `cpanel`, `digitalocean`, `dnsimple`, `dnsmadeeasy`, `domeneshop`, `gandi`, `gehirn`, `google`, `hetzner`, `inwx`, `linode`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `rfc2136`, `route53`, `sakuracloud` and `transip`. 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)." }
@@ -151,6 +151,7 @@ app_setup_nginx_reverse_proxy_block: ""
 
 # changelog
 changelogs:
+  - { date: "26.01.21:", desc: "Add support for hetzner dns validation." }
   - { date: "20.01.21:", desc: "Add check for ZeroSSL EAB retrieval." }
   - { date: "08.01.21:", desc: "Add support for getting certs from [ZeroSSL](https://zerossl.com/) via optional `CERTPROVIDER` env var. Update aliyun, domeneshop, inxw and transip dns plugins with the new plugin names. Hide `donoteditthisfile.conf` because users were editing it despite its name. Suppress harmless error when no proxy confs are enabled." }
   - { date: "03.01.21:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) /config/nginx/site-confs/default - Add helper pages to aid troubleshooting" }

root/defaults/dns-conf/hetzner.ini

@@ -0,0 +1,3 @@
+# Instructions: https://github.com/ctrlaltcoop/certbot-dns-hetzner
+# Replace with your values
+dns_hetzner_api_token = nohnah4zoo9Kiejee9aGh0thoopee2sa

root/etc/cont-init.d/50-config

@@ -93,7 +93,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|digitalocean|dnsimple|dnsmadeeasy|domeneshop|gandi|gehirn|google|inwx|linode|luadns|netcup|njalla|nsone|ovh|rfc2136|route53|sakuracloud|transip)$ ]] && \
+[[ "$VALIDATION" = "dns" ]] && [[ ! "$DNSPLUGIN" =~ ^(aliyun|cloudflare|cloudxns|cpanel|digitalocean|dnsimple|dnsmadeeasy|domeneshop|gandi|gehirn|google|hetzner|inwx|linode|luadns|netcup|njalla|nsone|ovh|rfc2136|route53|sakuracloud|transip)$ ]] && \
   echo "Please set the DNSPLUGIN variable to a valid plugin name. See docker info for more details." && \
   sleep infinity
 
@@ -207,7 +207,7 @@ 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|domeneshop|inwx|netcup|njalla|transip)$ ]]; then
+  elif [[ "$DNSPLUGIN" =~ ^(aliyun|domeneshop|hetzner|inwx|netcup|njalla|transip)$ ]]; 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}"
   else
@@ -255,7 +255,7 @@ if [ ! "$URL" = "$ORIGURL" ] || [ ! "$SUBDOMAINS" = "$ORIGSUBDOMAINS" ] || [ ! "
     REV_EAB_CREDS=$(curl -s https://api.zerossl.com/acme/eab-credentials-email --data "email=$ORIGEMAIL")
     REV_ZEROSSL_EAB_KID=$(echo "$REV_EAB_CREDS" | python3 -c "import sys, json; print(json.load(sys.stdin)['eab_kid'])")
     REV_ZEROSSL_EAB_HMAC_KEY=$(echo "$REV_EAB_CREDS" | python3 -c "import sys, json; print(json.load(sys.stdin)['eab_hmac_key'])")
-    if [ -z "$REV_ZEROSSL_EAB_KID" ] || or [ -z "$REV_ZEROSSL_EAB_HMAC_KEY" ]; then
+    if [ -z "$REV_ZEROSSL_EAB_KID" ] || [ -z "$REV_ZEROSSL_EAB_HMAC_KEY" ]; then
       echo "Unable to retrieve EAB credentials from ZeroSSL. Check the outgoing connections to api.zerossl.com and dns. Sleeping."
       sleep infinity
     fi
@@ -287,7 +287,7 @@ if [ ! -f "/config/keys/letsencrypt/fullchain.pem" ]; then
     EAB_CREDS=$(curl -s https://api.zerossl.com/acme/eab-credentials-email --data "email=$EMAIL")
     ZEROSSL_EAB_KID=$(echo "$EAB_CREDS" | python3 -c "import sys, json; print(json.load(sys.stdin)['eab_kid'])")
     ZEROSSL_EAB_HMAC_KEY=$(echo "$EAB_CREDS" | python3 -c "import sys, json; print(json.load(sys.stdin)['eab_hmac_key'])")
-    if [ -z "$ZEROSSL_EAB_KID" ] || or [ -z "$ZEROSSL_EAB_HMAC_KEY" ]; then
+    if [ -z "$ZEROSSL_EAB_KID" ] || [ -z "$ZEROSSL_EAB_HMAC_KEY" ]; then
       echo "Unable to retrieve EAB credentials from ZeroSSL. Check the outgoing connections to api.zerossl.com and dns. Sleeping."
       sleep infinity
     fi