Merge branch 'master' into odbc

Author: aptalca

Dockerfile

@@ -97,6 +97,7 @@ RUN \
 	certbot-dns-ovh \
 	certbot-dns-rfc2136 \
 	certbot-dns-route53 \
+	certbot-dns-transip \
 	requests && \
  echo "**** remove unnecessary fail2ban filters ****" && \
  rm \

Dockerfile.aarch64

@@ -97,6 +97,7 @@ RUN \
 	certbot-dns-ovh \
 	certbot-dns-rfc2136 \
 	certbot-dns-route53 \
+	certbot-dns-transip \
 	requests && \
  echo "**** remove unnecessary fail2ban filters ****" && \
  rm \

Dockerfile.armhf

@@ -97,6 +97,7 @@ RUN \
 	certbot-dns-ovh \
 	certbot-dns-rfc2136 \
 	certbot-dns-route53 \
+	certbot-dns-transip \
 	requests && \
  echo "**** remove unnecessary fail2ban filters ****" && \
  rm \

README.md

@@ -137,7 +137,7 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-e URL=yourdomain.url` | Top url you have control over (`customdomain.com` if you own it, or `customsubdomain.ddnsprovider.com` if dynamic dns). |
 | `-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` | Letsencrypt validation method to use, options are `http`, `tls-sni`, `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 DNSPLUGIN=cloudflare` | Required if `VALIDATION` is set to `dns`. Options are `cloudflare`, `cloudxns`, `digitalocean`, `dnsimple`, `dnsmadeeasy`, `google`, `inwx`, `linode`, `luadns`, `nsone`, `ovh`, `rfc2136` and `route53`. Also need to enter the credentials into the corresponding ini file under `/config/dns-conf`. |
+| `-e DNSPLUGIN=cloudflare` | Required if `VALIDATION` is set to `dns`. Options are `cloudflare`, `cloudxns`, `digitalocean`, `dnsimple`, `dnsmadeeasy`, `google`, `inwx`, `linode`, `luadns`, `nsone`, `ovh`, `rfc2136`, `route53` and `transip`. Also need to enter the credentials into the corresponding ini file under `/config/dns-conf`. |
 | `-e DUCKDNSTOKEN=<token>` | Required if `VALIDATION` is set to `duckdns`. Retrieve your token from https://www.duckdns.org |
 | `-e EMAIL=<e-mail>` | Optional e-mail address used for cert expiration notifications. |
 | `-e DHLEVEL=2048` | Dhparams bit value (default=2048, can be set to `1024` or `4096`). |
@@ -273,7 +273,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
-* **13.11.19:** - Add php7-pdo_odbc.
+* **17.11.19:** - Add php7-pdo_odbc.
+* **17.11.19:** - Add transip dns validation plugin.
 * **27.10.19:** - Turn off lua resty core to get rid of error message in the log (existing users will have to delete `/config/nginx/nginx.conf` and restart the container).
 * **26.10.19:** - Add new package for stream-geoip2, remove geoip2 module patch.
 * **24.10.19:** - Add php7-pecl-imagick.

package_versions.txt

@@ -47,7 +47,7 @@ libgd-2.2.5-r2
 libgpg-error-1.36-r2
 libice-1.0.9-r3
 libintl-0.19.8.1-r4
-libjpeg-turbo-2.0.2-r0
+libjpeg-turbo-2.0.3-r0
 libksba-1.3.5-r0
 libldap-2.4.48-r0
 libltdl-2.4.6-r6
@@ -59,7 +59,7 @@ libmnl-1.0.4-r0
 libmount-2.33.2-r0
 libnftnl-libs-1.1.3-r0
 libpng-1.6.37-r1
-libpq-11.5-r1
+libpq-11.6-r0
 libressl2.7-libcrypto-2.7.5-r0
 libressl2.7-libssl-2.7.5-r0
 libsasl-2.1.27-r3

readme-vars.yml

@@ -51,7 +51,7 @@ cap_add_param_vars:
 # optional container parameters
 opt_param_usage_include_env: true
 opt_param_env_vars:
-  - { env_var: "DNSPLUGIN", env_value: "cloudflare", desc: "Required if `VALIDATION` is set to `dns`. Options are `cloudflare`, `cloudxns`, `digitalocean`, `dnsimple`, `dnsmadeeasy`, `google`, `inwx`, `linode`, `luadns`, `nsone`, `ovh`, `rfc2136` and `route53`. Also need to enter the credentials into the corresponding ini file under `/config/dns-conf`." }
+  - { env_var: "DNSPLUGIN", env_value: "cloudflare", desc: "Required if `VALIDATION` is set to `dns`. Options are `cloudflare`, `cloudxns`, `digitalocean`, `dnsimple`, `dnsmadeeasy`, `google`, `inwx`, `linode`, `luadns`, `nsone`, `ovh`, `rfc2136`, `route53` and `transip`. Also need to enter the credentials into the corresponding ini file under `/config/dns-conf`." }
   - { env_var: "DUCKDNSTOKEN", env_value: "<token>", desc: "Required if `VALIDATION` is set to `duckdns`. Retrieve your token from https://www.duckdns.org" }
   - { env_var: "EMAIL", env_value: "<e-mail>", desc: "Optional e-mail address used for cert expiration notifications." }
   - { env_var: "DHLEVEL", env_value: "2048", desc: "Dhparams bit value (default=2048, can be set to `1024` or `4096`)." }
@@ -126,7 +126,8 @@ app_setup_nginx_reverse_proxy_block: ""
 
 # changelog
 changelogs:
-  - { date: "13.11.19:", desc: "Add php7-pdo_odbc." }
+  - { date: "17.11.19:", desc: "Add php7-pdo_odbc." }
+  - { date: "17.11.19:", desc: "Add transip dns validation plugin." }
   - { date: "27.10.19:", desc: "Turn off lua resty core to get rid of error message in the log (existing users will have to delete `/config/nginx/nginx.conf` and restart the container)." }
   - { date: "26.10.19:", desc: "Add new package for stream-geoip2, remove geoip2 module patch." }
   - { date: "24.10.19:", desc: "Add php7-pecl-imagick." }

root/defaults/dns-conf/transip.ini

@@ -0,0 +1,6 @@
+# Instructions: https://readthedocs.org/projects/certbot-dns-transip/
+# Convert the key to an RSA key (openssl rsa -in transip.key -out transip-rsa.key)
+# Place .key-file in the same directory as this file. Location "/config/dns-conf" is from within the container
+
+certbot_dns_transip:dns_transip_username = <transip_username>
+certbot_dns_transip:dns_transip_key_file = /config/dns-conf/transip-rsa.key

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

@@ -76,7 +76,7 @@ cp /config/fail2ban/jail.local /etc/fail2ban/jail.local
 	cp /defaults/ldap.conf /config/nginx/ldap.conf
 
 # check to make sure DNSPLUGIN is selected if dns validation is used
-[[ "$VALIDATION" = "dns" ]] && [[ ! "$DNSPLUGIN" =~ ^(cloudflare|cloudxns|digitalocean|dnsimple|dnsmadeeasy|google|inwx|linode|luadns|nsone|ovh|rfc2136|route53)$ ]] && \
+[[ "$VALIDATION" = "dns" ]] && [[ ! "$DNSPLUGIN" =~ ^(cloudflare|cloudxns|digitalocean|dnsimple|dnsmadeeasy|google|inwx|linode|luadns|nsone|ovh|rfc2136|route53|transip)$ ]] && \
   echo "Please set the DNSPLUGIN variable to a valid plugin name. See docker info for more details." && \
   sleep infinity
 
@@ -174,7 +174,7 @@ fi
 if [ "$VALIDATION" = "dns" ]; then
   if [ "$DNSPLUGIN" = "route53" ]; then
     PREFCHAL="--dns-${DNSPLUGIN} --manual-public-ip-logging-ok"
-  elif [ "$DNSPLUGIN" = "inwx" ]; then
+  elif [[ "$DNSPLUGIN" =~ ^(inwx|transip)$ ]]; then
     PREFCHAL="-a certbot-dns-${DNSPLUGIN}:dns-${DNSPLUGIN} --certbot-dns-${DNSPLUGIN}:dns-${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.ini --manual-public-ip-logging-ok"
   else
     PREFCHAL="--dns-${DNSPLUGIN} --dns-${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.ini --manual-public-ip-logging-ok"