Merge pull request #5 from 2sheds/certbot-custom-args

Support for custom plugin and more certbot args

Author: ebarault

README.md

@@ -35,10 +35,12 @@ The following volumes of interest can be mounted on the docker host or as docker
 
 #### Environment variables:
 - **WEBROOT** : (optional) path to the host's web server root. If provided, letsencrypt will use the given existing web server to request and validate the certificates. If not provided, letsencrypt will launch it's own web server for this purpose
+- **PLUGIN** : (optional, defaults to `standalone`) A `certbot` plugin to use (e.g. `manual`)
 - **PREFERRED_CHALLENGES** : (optional, defaults to http-01) A sorted, comma delimited list of the preferred challenge to use during authorization with the most preferred challenge listed first (eg. "dns" or "tls-alpn-01,http,dns"). NOTE: tls-alpn-01 challenge is yet not supported by certbot 0.31.0
+- **CUSTOM_ARGS** : (optional) Additional `certbot` command-line options (e.g. `--redirect`), refer to certbot [documentation](https://certbot.eff.org/docs/using.html#certbot-command-line-options)
 - **LOGFILE** : (optional) path of a file where to write the logs from the certificate request/renewal script. When not provided both stdout/stderr are directed to console which is convenient when using a docker log driver
-- **DEBUG** : (optional) whether to run letsencrypt in debug mode, refer to certbot [documentation] (https://certbot.eff.org/docs/using.html#certbot-command-line-options)
-- **STAGING** : (optional) whether to run letsencrypt in staging mode, refer to certbot [documentation] (https://certbot.eff.org/docs/using.html#certbot-command-line-options)
+- **DEBUG** : (optional) whether to run letsencrypt in debug mode, refer to certbot [documentation](https://certbot.eff.org/docs/using.html#certbot-command-line-options)
+- **STAGING** : (optional) whether to run letsencrypt in staging mode, refer to certbot [documentation](https://certbot.eff.org/docs/using.html#certbot-command-line-options)
 - **DOMAINS** : space separated list of comma separated subdomains to register the certificate with, for example:
   - `my.domain.com`
   - `sub.domain1.com,sub.domain2.com`

scripts/run_certbot.sh

@@ -131,7 +131,7 @@ CERTBOT_ARGS=""
 if [ $WEBROOT ]; then
   CERTBOT_ARGS=" --webroot -w $WEBROOT"
 else
-  CERTBOT_ARGS=" --standalone --preferred-challenges ${PREFERRED_CHALLENGES:-http-01}"
+  CERTBOT_ARGS=" --${PLUGIN:-standalone} --preferred-challenges ${PREFERRED_CHALLENGES:-http-01} ${CUSTOM_ARGS}"
 fi
 
 # activate debug mode