X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4e527029e462d60779c7b40ed2ad8b1cbe6eddd3..3236e0cbbe0fcb9e684d63a0ffac4d1f4a0d96b8:/tools/salt-install/common.sh diff --git a/tools/salt-install/common.sh b/tools/salt-install/common.sh index 7cc4c3b232..5392da71be 100644 --- a/tools/salt-install/common.sh +++ b/tools/salt-install/common.sh @@ -48,6 +48,14 @@ for node in "${!NODES[@]}"; do done done +# Sets TLS certificate expiration thresholds +TLS_EXPIRATION_YELLOW=5184000 # > 2 months +TLS_EXPIRATION_GREEN=15552000 # > 6 months +if [[ "${SSL_MODE}" == "lets-encrypt" ]]; then + TLS_EXPIRATION_YELLOW=1900800 # > 22 days + TLS_EXPIRATION_GREEN=2505600 # > 29 days +fi + # Auto-detects load-balancing mode if [ -z "${ROLE2NODES['balancer']:-}" ]; then ENABLE_BALANCER="no" @@ -56,6 +64,6 @@ else fi # Auto-sets PG version if needed -if [ -n "${ROLE2NODES['database']:-}" ]; then +if [[ -n "${ROLE2NODES['database']:-}" || "${NODELIST}" == "localhost" ]]; then DATABASE_POSTGRESQL_VERSION="${DATABASE_POSTGRESQL_VERSION:-${DATABASE_POSTGRESQL_DEFAULT_VERSION}}" fi \ No newline at end of file