diff --git a/letsencrypt/CHANGELOG.md b/letsencrypt/CHANGELOG.md index a71d2a4..807f2b4 100755 --- a/letsencrypt/CHANGELOG.md +++ b/letsencrypt/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 4.2 +- Bugfix default empty dns setting + ## 4.1 - Pin image to Alpine3.10 diff --git a/letsencrypt/README.md b/letsencrypt/README.md index 86df3a1..85fb02c 100644 --- a/letsencrypt/README.md +++ b/letsencrypt/README.md @@ -44,7 +44,37 @@ IF you choose "dns" as "challenge", you will also need to fill: ```json "dnsprovider": "" (Add the dnsprovider of your choice from the list of "Supported DNS providers" below) -In addition fill the fields according to the credentials required by your dns provider. +In addition add the fields according to the credentials required by your dns provider: + +```json +"cloudflare_email": "", +"cloudflare_api_key": "", +"cloudxns_api_key": "", +"cloudxns_secret_key": "", +"digitalocean_token": "", +"dnsimple_token": "", +"dnsmadeeasy_api_key": "", +"dnsmadeeasy_secret_key": "", +"gehirn_api_token": "", +"gehirn_api_secret": "", +"linode_key": "", +"linode_version": "", +"luadns_email": "", +"luadns_token": "", +"nsone_api_key": "", +"ovh_endpoint": "", +"ovh_application_key": "", +"ovh_application_secret": "", +"ovh_consumer_key": "", +"rfc2136_server": "", +"rfc2136_port": "", +"rfc2136_name": "", +"rfc2136_secret": "", +"rfc2136_algorithm": "", +"aws_access_key_id": "", +"aws_secret_access_key": "", +"sakuracloud_api_token": "", +"sakuracloud_api_secret": "" ``` ## Configuration diff --git a/letsencrypt/config.json b/letsencrypt/config.json index 9de33aa..4c80ab6 100755 --- a/letsencrypt/config.json +++ b/letsencrypt/config.json @@ -1,6 +1,6 @@ { "name": "Let's Encrypt", - "version": "4.1", + "version": "4.2", "slug": "letsencrypt", "description": "Manage certificate from Let's Encrypt", "url": "https://home-assistant.io/addons/lets_encrypt/", diff --git a/letsencrypt/run.sh b/letsencrypt/run.sh index f8ab1e2..cd5f501 100755 --- a/letsencrypt/run.sh +++ b/letsencrypt/run.sh @@ -5,7 +5,7 @@ DOMAINS=$(bashio::config 'domains') KEYFILE=$(bashio::config 'keyfile') CERTFILE=$(bashio::config 'certfile') CHALLENGE=$(bashio::config 'challenge') -DNS_PROVIDER=$(bashio::config 'dns.provider // empty') +DNS_PROVIDER=$(bashio::config 'dns.provider') CERT_DIR=/data/letsencrypt WORK_DIR=/data/workdir @@ -16,34 +16,34 @@ mkdir -p "/ssl" chmod +x /run.sh touch /data/dnsapikey -echo -e "dns_cloudflare_email = $(bashio::config 'dns.cloudflare_email // empty')\n" \ - "dns_cloudflare_api_key = $(bashio::config 'dns.cloudflare_api_key // empty')\n" \ - "dns_cloudxns_api_key = $(bashio::config 'dns.cloudxns_api_key // empty')\n" \ - "dns_cloudxns_secret_key = $(bashio::config 'dns.cloudxns_secret_key // empty')\n" \ - "dns_digitalocean_token = $(bashio::config 'dns.digitalocean_token // empty')\n" \ - "dns_dnsimple_token = $(bashio::config 'dns.dnsimple_token // empty')\n" \ - "dns_dnsmadeeasy_api_key = $(bashio::config 'dns.dnsmadeeasy_api_key // empty')\n" \ - "dns_dnsmadeeasy_secret_key = $(bashio::config 'dns.dnsmadeeasy_secret_key // empty')\n" \ - "dns_gehirn_api_token = $(bashio::config 'dns.gehirn_api_token // empty')\n" \ - "dns_gehirn_api_secret = $(bashio::config 'dns.gehirn_api_secret // empty')\n" \ - "dns_linode_key = $(bashio::config 'dns.linode_key // empty')\n" \ - "dns_linode_version = $(bashio::config 'dns.linode_version // empty')\n" \ - "dns_luadns_email = $(bashio::config 'dns.luadns_email // empty')\n" \ - "dns_luadns_token = $(bashio::config 'dns.luadns_token // empty')\n" \ - "dns_nsone_api_key = $(bashio::config 'dns.nsone_api_key // empty')\n" \ - "dns_ovh_endpoint = $(bashio::config 'dns.ovh_endpoint // empty')\n" \ - "dns_ovh_application_key = $(bashio::config 'dns.ovh_application_key // empty')\n" \ - "dns_ovh_application_secret = $(bashio::config 'dns.ovh_application_secret // empty')\n" \ - "dns_ovh_consumer_key = $(bashio::config 'dns.ovh_consumer_key // empty')\n" \ - "dns_rfc2136_server = $(bashio::config 'dns.rfc2136_server // empty')\n" \ - "dns_rfc2136_port = $(bashio::config 'dns.rfc2136_port // empty')\n" \ - "dns_rfc2136_name = $(bashio::config 'dns.rfc2136_name // empty')\n" \ - "dns_rfc2136_secret = $(bashio::config 'dns.rfc2136_secret // empty')\n" \ - "dns_rfc2136_algorithm = $(bashio::config 'dns.rfc2136_algorithm // empty')\n" \ - "aws_access_key_id = $(bashio::config 'dns.aws_access_key_id // empty')\n" \ - "aws_secret_access_key = $(bashio::config 'dns.aws_secret_access_key // empty')\n" \ - "dns_sakuracloud_api_token = $(bashio::config 'dns.sakuracloud_api_token // empty')\n" \ - "dns_sakuracloud_api_secret = $(bashio::config 'dns.sakuracloud_api_secret // empty')" > /data/dnsapikey +echo -e "dns_cloudflare_email = $(bashio::config 'dns.cloudflare_email')\n" \ + "dns_cloudflare_api_key = $(bashio::config 'dns.cloudflare_api_key')\n" \ + "dns_cloudxns_api_key = $(bashio::config 'dns.cloudxns_api_key')\n" \ + "dns_cloudxns_secret_key = $(bashio::config 'dns.cloudxns_secret_key')\n" \ + "dns_digitalocean_token = $(bashio::config 'dns.digitalocean_token')\n" \ + "dns_dnsimple_token = $(bashio::config 'dns.dnsimple_token')\n" \ + "dns_dnsmadeeasy_api_key = $(bashio::config 'dns.dnsmadeeasy_api_key')\n" \ + "dns_dnsmadeeasy_secret_key = $(bashio::config 'dns.dnsmadeeasy_secret_key')\n" \ + "dns_gehirn_api_token = $(bashio::config 'dns.gehirn_api_token')\n" \ + "dns_gehirn_api_secret = $(bashio::config 'dns.gehirn_api_secret')\n" \ + "dns_linode_key = $(bashio::config 'dns.linode_key')\n" \ + "dns_linode_version = $(bashio::config 'dns.linode_version')\n" \ + "dns_luadns_email = $(bashio::config 'dns.luadns_email')\n" \ + "dns_luadns_token = $(bashio::config 'dns.luadns_token')\n" \ + "dns_nsone_api_key = $(bashio::config 'dns.nsone_api_key')\n" \ + "dns_ovh_endpoint = $(bashio::config 'dns.ovh_endpoint')\n" \ + "dns_ovh_application_key = $(bashio::config 'dns.ovh_application_key')\n" \ + "dns_ovh_application_secret = $(bashio::config 'dns.ovh_application_secret')\n" \ + "dns_ovh_consumer_key = $(bashio::config 'dns.ovh_consumer_key')\n" \ + "dns_rfc2136_server = $(bashio::config 'dns.rfc2136_server')\n" \ + "dns_rfc2136_port = $(bashio::config 'dns.rfc2136_port')\n" \ + "dns_rfc2136_name = $(bashio::config 'dns.rfc2136_name')\n" \ + "dns_rfc2136_secret = $(bashio::config 'dns.rfc2136_secret')\n" \ + "dns_rfc2136_algorithm = $(bashio::config 'dns.rfc2136_algorithm')\n" \ + "aws_access_key_id = $(bashio::config 'dns.aws_access_key_id')\n" \ + "aws_secret_access_key = $(bashio::config 'dns.aws_secret_access_key')\n" \ + "dns_sakuracloud_api_token = $(bashio::config 'dns.sakuracloud_api_token')\n" \ + "dns_sakuracloud_api_secret = $(bashio::config 'dns.sakuracloud_api_secret')" > /data/dnsapikey chmod 600 /data/dnsapikey # Generate new certs