From d83d91f7ca2d37dd913d2ad7ccebc4d9a5b77801 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20B=C3=A9rtoli?= Date: Mon, 28 Feb 2022 14:10:46 -0300 Subject: [PATCH] 18785: add missing lines addressing review suggestions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Arvados-DCO-1.1-Signed-off-by: Javier Bértoli --- ...params.example.single_host_single_hostname | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/tools/salt-install/local.params.example.single_host_single_hostname b/tools/salt-install/local.params.example.single_host_single_hostname index 6a7460de8e..d01c73d2c8 100644 --- a/tools/salt-install/local.params.example.single_host_single_hostname +++ b/tools/salt-install/local.params.example.single_host_single_hostname @@ -59,27 +59,18 @@ SSL_MODE="self-signed" # A single certificate for the external hostname of the host will be retrieved, using # "standalone" mode of LE. -# If you going to provide your own certificates for Arvados, the provision script can -# help you deploy them. In order to do that, you need to set `SSL_MODE=bring-your-own` above, -# and copy the required certificates under the directory specified in the next line. -# The certs will be copied from this directory by the provision script. +# If you going to provide your own certificate for Arvados, the provision script can +# help you deploy it. In order to do that, you need to set `SSL_MODE=bring-your-own` above, +# and copy the required certificate under the directory specified in the next line. +# The cert will be copied from this directory by the provision script. # Please set it to the FULL PATH to the certs dir if you're going to use a different dir # Default is "${SCRIPT_DIR}/certs", where the variable "SCRIPT_DIR" has the path to the # directory where the "provision.sh" script was copied in the destination host. # CUSTOM_CERTS_DIR="${SCRIPT_DIR}/certs" -# The script expects cert/key files with these basenames (matching the role except for -# keepweb, which is split in both download/collections): -# "controller" -# "websocket" -# "workbench" -# "workbench2" -# "webshell" -# "download" # Part of keepweb -# "collections" # Part of keepweb -# "keepproxy" # Keepproxy -# Ie., 'keep', the script will lookup for -# ${CUSTOM_CERTS_DIR}/keepproxy.crt -# ${CUSTOM_CERTS_DIR}/keepproxy.key +# The script expects cert/key files with the filename matcing ${HOSTNAME_EXT} above +# Ie., for "HOSTNAME_EXT='my-arvados.example.net', the script will lookup for +# ${CUSTOM_CERTS_DIR}/my-arvados.example.net.crt +# ${CUSTOM_CERTS_DIR}/my-arvados.example.net.key # The certs will be copied from this directory by the provision script. # The directory to check for the config files (pillars, states) you want to use. -- 2.30.2