Merge branch '18682-use-keyrings-instead-of-key-ids'

closes #18682
Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>

diff --cc tools/salt-install/local.params.example.single_host_single_hostname
Simple merge

diff --cc tools/salt-install/provision.sh
index 644b87cbbf9c254eaf4c9782b7def1c47a565c4a,67a171fc4ea067f1c4856616d5f42ac288b687bf..27dada1eab5802cee177a2953779e6f137047cd8
--- 1/tools/salt-install/provision.sh
--- 2/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@@ -557,25 -533,18 +557,17 @@@ if [ -z "${ROLES}" ]; the
    echo "    - nginx_workbench_configuration" >> ${P_DIR}/top.sls
    echo "    - postgresql" >> ${P_DIR}/top.sls
  
 -  # Currently, only available on config_examples/multi_host/aws
 -  if [ "x${USE_LETSENCRYPT}" = "xyes" ]; then
 -    if [ "x${USE_LETSENCRYPT_IAM_USER}" != "xyes" ]; then
 +  if [ "${SSL_MODE}" = "lets-encrypt" ]; then
 +    if [ "${USE_LETSENCRYPT_ROUTE53}" = "yes" ]; then
        grep -q "aws_credentials" ${P_DIR}/top.sls || echo "    - aws_credentials" >> ${P_DIR}/top.sls
      fi
 -    grep -q "letsencrypt"     ${P_DIR}/top.sls || echo "    - letsencrypt" >> ${P_DIR}/top.sls
 +    grep -q "letsencrypt" ${P_DIR}/top.sls || echo "    - letsencrypt" >> ${P_DIR}/top.sls
  
      # As the pillar differ whether we use LE or custom certs, we need to do a final edition on them
-     for c in controller websocket workbench workbench2 webshell keepweb keepproxy; do
-       if [ "${USE_SINGLE_HOSTNAME}" = "yes" ]; then
-         # Are we in a single-host-single-hostname env?
-         CERT_NAME=${HOSTNAME_EXT}
-       else
-         # We are in a single-host-multiple-hostnames env
-         CERT_NAME=${c}.${CLUSTER}.${DOMAIN}
-       fi
- 
-       sed -i "s/__CERT_REQUIRES__/cmd: create-initial-cert-${CERT_NAME}*/g;
-               s#__CERT_PEM__#/etc/letsencrypt/live/${CERT_NAME}/fullchain.pem#g;
-               s#__CERT_KEY__#/etc/letsencrypt/live/${CERT_NAME}/privkey.pem#g" \
+     for c in controller websocket workbench workbench2 webshell download collections keepproxy; do
+       sed -i "s/__CERT_REQUIRES__/cmd: create-initial-cert-${c}.${CLUSTER}.${DOMAIN}*/g;
+               s#__CERT_PEM__#/etc/letsencrypt/live/${c}.${CLUSTER}.${DOMAIN}/fullchain.pem#g;
+               s#__CERT_KEY__#/etc/letsencrypt/live/${c}.${CLUSTER}.${DOMAIN}/privkey.pem#g" \
        ${P_DIR}/nginx_${c}_configuration.sls
      done
    else