-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
letsencrypt: Use maintained Hurricane Electric certbot plugin #3856
base: master
Are you sure you want to change the base?
Changes from all commits
7929cdb
781cc40
536fdca
cd6c742
ba469fc
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -1,5 +1,5 @@ | ||||||
--- | ||||||
version: 5.2.10 | ||||||
version: 5.2.11 | ||||||
slug: letsencrypt | ||||||
name: Let's Encrypt | ||||||
description: Manage certificate from Let's Encrypt | ||||||
|
@@ -109,7 +109,7 @@ schema: | |||||
dns-hetzner|dns-infomaniak|dns-ionos|dns-joker|dns-linode|dns-loopia|dns-luadns|\ | ||||||
dns-mijn-host|dns-njalla|dns-nsone|dns-porkbun|dns-ovh|dns-rfc2136|dns-route53|\ | ||||||
dns-sakuracloud|dns-namecheap|dns-netcup|dns-simply|dns-gandi|dns-transip|dns-inwx|\ | ||||||
dns-dreamhost|dns-he|dns-easydns|dns-domainoffensive|dns-websupport|dns-noris|\ | ||||||
dns-dreamhost|dns-hurricane_electric|dns-easydns|dns-domainoffensive|dns-websupport|dns-noris|\ | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Leave this as is.
Suggested change
|
||||||
dns-plesk)?" | ||||||
rfc2136_algorithm: str? | ||||||
rfc2136_name: str? | ||||||
|
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -63,12 +63,12 @@ elif [ "${CHALLENGE}" == "dns" ] && [ "${DNS_PROVIDER}" == "dns-namecheap" ]; th | |||||
bashio::config.require 'dns.namecheap_username' | ||||||
bashio::config.require 'dns.namecheap_api_key' | ||||||
PROVIDER_ARGUMENTS+=("--authenticator" "${DNS_PROVIDER}" "--${DNS_PROVIDER}-credentials" "/data/dnsapikey" "--${DNS_PROVIDER}-propagation-seconds" "${PROPAGATION_SECONDS}") | ||||||
|
||||||
#mijn.host | ||||||
elif [ "${CHALLENGE}" == "dns" ] && [ "${DNS_PROVIDER}" == "dns-mijn-host" ]; then | ||||||
bashio::config.require 'dns.mijn_host_api_key' | ||||||
PROVIDER_ARGUMENTS+=("--authenticator" "${DNS_PROVIDER}" "--${DNS_PROVIDER}-credentials" "/data/dnsapikey" "--${DNS_PROVIDER}-propagation-seconds" "${PROPAGATION_SECONDS}") | ||||||
|
||||||
#Netcup | ||||||
elif [ "${CHALLENGE}" == "dns" ] && [ "${DNS_PROVIDER}" == "dns-netcup" ]; then | ||||||
bashio::config.require 'dns.netcup_customer_id' | ||||||
|
@@ -245,7 +245,7 @@ elif [ "${CHALLENGE}" == "dns" ] && [ "${DNS_PROVIDER}" == "dns-dreamhost" ]; th | |||||
PROVIDER_ARGUMENTS+=("--authenticator" "${DNS_PROVIDER}" "--dns-dreamhost-credentials" "/data/dnsapikey") | ||||||
|
||||||
# Hurricane Electric | ||||||
elif [ "${CHALLENGE}" == "dns" ] && [ "${DNS_PROVIDER}" == "dns-he" ]; then | ||||||
elif [ "${CHALLENGE}" == "dns" ] && [ "${DNS_PROVIDER}" == "dns-hurricane_electric" ]; then | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here, pretend we are DNS provider
Suggested change
|
||||||
bashio::config.require 'dns.he_user' | ||||||
bashio::config.require 'dns.he_pass' | ||||||
PROVIDER_ARGUMENTS+=("--authenticator" "${DNS_PROVIDER}" "--${DNS_PROVIDER}-credentials" "/data/dnsapikey" "--${DNS_PROVIDER}-propagation-seconds" "${PROPAGATION_SECONDS}") | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. But then, explicitly use
Suggested change
|
||||||
|
@@ -310,7 +310,7 @@ if bashio::config.exists 'key_type'; then | |||||
fi | ||||||
else | ||||||
bashio::log.info "Detecting existing certificate type for ${DOMAIN_ARR[1]}" | ||||||
readarray -t CBCERTS < <(certbot certificates --non-interactive --cert-name "${DOMAIN_ARR[1]}" --config-dir "$CERT_DIR" --work-dir "$WORK_DIR") | ||||||
readarray -t CBCERTS < <(certbot certificates --non-interactive --cert-name "${DOMAIN_ARR[1]}" --config-dir "$CERT_DIR" --work-dir "$WORK_DIR") | ||||||
agners marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
for output in "${CBCERTS[@]}"; do | ||||||
# shellcheck disable=SC2076 | ||||||
if [[ $output =~ "No certificates found." ]]; then | ||||||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think that this is strictly necessary. So with the following changes, we can make this backwards compatible.