Merge branch 'issue-261_buster' into 'buster-testing'

Fixes #261 - Adds detection of NAT64 environments.

See merge request sympl/sympl!125

core/debian/changelog

+sympl-core (10.0.190816.0) stable; urgency=medium
+
+  * Adds detection of NAT64 environments for sympl-ssl wrapper.
+
+ -- Paul Cammish <sympl@kelduum.net>  Fri, 16 Aug 2019 18:11:00 +0100
+
 sympl-core (10.0.190729.0) stable; urgency=medium
 
   * Copy root users authorized_keys to Sympl user on first install.

core/debian/control

@@ -14,7 +14,7 @@ Depends: lsb-base (>= 3.0-6),
   ruby | ruby-interpreter, ruby-json-jwt, ruby-password, ruby-diffy,
   ruby-erubis, ruby-mocha, ruby-webmock, ruby-test-unit, ruby-faraday,
   python, python-apt, gnutls-bin, gcc, libpam-tmpdir, wbritish | wordlist,
-  libpam-cracklib, dnsutils, ${misc:Depends}
+  libpam-cracklib, dnsutils, libc-bin, ${misc:Depends}
 Recommends: sympl-backup, sympl-cron, sympl-mail, sympl-firewall,
   sympl-ftp, sympl-web, sympl-monit, sympl-mysql, sympl-phpmyadmin,
   sympl-dns, sympl-webmail, sympl-updater,

core/sbin/sympl-ssl

 #!/bin/bash -e
 
-# Workaround rapper script for sympl-ssl to fix a bug in IPv6 only resolution of the LE API DNS.
+# Workaround wrapper script for sympl-ssl to fix a bug in IPv6 only resolution of the LE API DNS.
 
 # If theres no IPv4 address assigned...
-if [ $( sympl-ip -a | grep -c '\.' ) == 0 ]; then
+if [ $( sympl-ip -a | grep -c '\.' ) == 0 ] || [ $( getent hosts ipv4only.arpa | grep -c ':' ) != 0 ] ; then
   if [[ $@ == *'--verbose'* ]]; then echo 'Applying IPv6 only workaround...'; fi
 
   # Do a DNS lookup for acme-v01.api.letsencrypt.org...