From 1d068f13d0c9148dcee20c7802bf61956f8e3267 Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Fri, 13 Oct 2023 17:16:42 -0300 Subject: [PATCH 1/1] 20969: Fixes single host case. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- .../pillars/nginx_keepproxy_configuration.sls | 2 +- .../pillars/nginx_keepweb_configuration.sls | 2 +- .../pillars/nginx_webshell_configuration.sls | 2 +- .../pillars/nginx_websocket_configuration.sls | 2 +- .../single_host/multiple_hostnames/states/snakeoil_certs.sls | 4 ++-- .../single_host/single_hostname/states/snakeoil_certs.sls | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_keepproxy_configuration.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_keepproxy_configuration.sls index 89412e4240..85e711dc6a 100644 --- a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_keepproxy_configuration.sls +++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_keepproxy_configuration.sls @@ -33,7 +33,7 @@ nginx: enabled: true overwrite: true requires: - file: extra_custom_certs_file_copy_arvados-keepproxy.pem + file: extra_custom_certs_keepproxy_cert_file_copy config: - server: - server_name: keep.__CLUSTER__.__DOMAIN__ diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_keepweb_configuration.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_keepweb_configuration.sls index 5859d4cfa4..daa1f31929 100644 --- a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_keepweb_configuration.sls +++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_keepweb_configuration.sls @@ -39,7 +39,7 @@ nginx: enabled: true overwrite: true requires: - file: extra_custom_certs_file_copy_arvados-{{ vh }}.pem + file: extra_custom_certs_{{ vh }}_cert_file_copy config: - server: - server_name: {{ vh }}.__CLUSTER__.__DOMAIN__ diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_webshell_configuration.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_webshell_configuration.sls index 1afc7ab805..541921ca31 100644 --- a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_webshell_configuration.sls +++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_webshell_configuration.sls @@ -55,7 +55,7 @@ nginx: enabled: true overwrite: true requires: - file: extra_custom_certs_file_copy_arvados-webshell.pem + file: extra_custom_certs_webshell_cert_file_copy config: - server: - server_name: webshell.__CLUSTER__.__DOMAIN__ diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_websocket_configuration.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_websocket_configuration.sls index 2a1f241836..f9864f109d 100644 --- a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_websocket_configuration.sls +++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_websocket_configuration.sls @@ -33,7 +33,7 @@ nginx: enabled: true overwrite: true requires: - file: extra_custom_certs_file_copy_arvados-websocket.pem + file: extra_custom_certs_websocket_cert_file_copy config: - server: - server_name: ws.__CLUSTER__.__DOMAIN__ diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/states/snakeoil_certs.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/states/snakeoil_certs.sls index 5f83582bc3..6518646a74 100644 --- a/tools/salt-install/config_examples/single_host/multiple_hostnames/states/snakeoil_certs.sls +++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/states/snakeoil_certs.sls @@ -173,8 +173,8 @@ extra_snakeoil_certs_arvados_snakeoil_cert_{{ vh }}_cmd_run: - pkg: extra_snakeoil_certs_dependencies_pkg_installed - cmd: extra_snakeoil_certs_arvados_snakeoil_ca_cmd_run - require_in: - - file: extra_custom_certs_file_copy_arvados-{{ vh }}.pem - - file: extra_custom_certs_file_copy_arvados-{{ vh }}.key + - file: extra_custom_certs_{{ vh }}_cert_file_copy + - file: extra_custom_certs_{{ vh }}_key_file_copy {%- if grains.get('os_family') == 'Debian' %} extra_snakeoil_certs_certs_permissions_{{ vh}}_cmd_run: diff --git a/tools/salt-install/config_examples/single_host/single_hostname/states/snakeoil_certs.sls b/tools/salt-install/config_examples/single_host/single_hostname/states/snakeoil_certs.sls index 0ee7949183..2cee5c9b49 100644 --- a/tools/salt-install/config_examples/single_host/single_hostname/states/snakeoil_certs.sls +++ b/tools/salt-install/config_examples/single_host/single_hostname/states/snakeoil_certs.sls @@ -143,8 +143,8 @@ extra_snakeoil_certs_arvados_snakeoil_cert___HOSTNAME_EXT___cmd_run: - pkg: extra_snakeoil_certs_dependencies_pkg_installed - cmd: extra_snakeoil_certs_arvados_snakeoil_ca_cmd_run - require_in: - - file: extra_custom_certs_file_copy_arvados-__HOSTNAME_EXT__.pem - - file: extra_custom_certs_file_copy_arvados-__HOSTNAME_EXT__.key + - file: extra_custom_certs___HOSTNAME_EXT___cert_file_copy + - file: extra_custom_certs___HOSTNAME_EXT___key_file_copy {%- if grains.get('os_family') == 'Debian' %} extra_snakeoil_certs_certs_permissions___HOSTNAME_EXT___cmd_run: -- 2.30.2