diff --git a/cns-hook-util b/cns-hook-util index f0374cd..027b20b 100755 --- a/cns-hook-util +++ b/cns-hook-util @@ -5,6 +5,7 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. # Copyright 2021 Joyent, Inc. +# Copyright 2023 MNX Cloud, Inc. function getservice { local vmuuid @@ -168,7 +169,7 @@ function merge_token { *) # We should never hit this becuase it would have been filtered out # much earlier. - echo "ERROR: Unknown serivce: $vmservice" + echo "ERROR: Unknown service: $vmservice" ;; esac fi @@ -236,20 +237,21 @@ function clean_challenge { mdata_delete "triton.cns.acme-challenge" else local vmuuid - case "$(getservice "${domain}")" in - cloudapi|adminui|docker|cmon|grafana) - local alias - alias="$(getservice "${domain}")0" - vmuuid="$(vmadm lookup alias="$alias")" - verifyvm "$domain" "$vmuuid" - echo "{\"remove_customer_metadata\":[\"triton.cns.acme-challenge\"]}" | \ - vmadm update "$vmuuid" - ;; - *) - # We should never hit this becuase it would have been filtered out - # much earlier. - echo "ERROR: Unknown serivce: $vmservice" - ;; + vmservice="$(getservice "${domain}")" + case "$vmservice" in + cloudapi|adminui|docker|cmon|grafana|manta) + local alias + alias="$(getservice "${domain}")0" + vmuuid="$(vmadm lookup alias="$alias")" + verifyvm "$domain" "$vmuuid" + echo "{\"remove_customer_metadata\":[\"triton.cns.acme-challenge\"]}" | \ + vmadm update "$vmuuid" + ;; + *) + # We should never hit this becuase it would have been filtered out + # much earlier. + echo "ERROR: Unknown service: $vmservice" + ;; esac fi diff --git a/config.ecdsa b/config.ecdsa index 7b828ba..45801ee 100644 --- a/config.ecdsa +++ b/config.ecdsa @@ -1,7 +1,7 @@ -# This file is for serivces that should use an ECDSA certificate. Currently, -# this is strongly recomended for CMON. Docker and AdminUI may also use ECDSA -# but by default will use RSA. CloudAPI and Manta, due to their use of stud, -# will crash if supplied with an ECDSA certificate. +# This file is for services that should use an ECDSA certificate. Currently, +# this is strongly recomended for CMON. All other services and clients support +# both RSA and ECDSA, but if you have an older version of some serives that use +# stud you will need to use RSA. # # To deploy an ECDSA certificate for cmon, create `domains.ecdsa.txt` with the # name of your cmon zone (including a wildcard name). E.g.: