projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
21361: Fix comment typo
[arvados.git]
/
tools
/
salt-install
/
config_examples
/
single_host
/
multiple_hostnames
/
states
/
snakeoil_certs.sls
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 5f83582bc3c32e496c555383c2ad004ec312c8ec..06af05b2df56e11eb0daf1f0b3bb26545cfe70b1 100644
(file)
--- 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
@@
-63,7
+63,7
@@
extra_snakeoil_certs_arvados_snakeoil_ca_cmd_run:
# Taken from https://github.com/arvados/arvados/blob/master/tools/arvbox/lib/arvbox/docker/service/certificate/run
cmd.run:
- name: |
# Taken from https://github.com/arvados/arvados/blob/master/tools/arvbox/lib/arvbox/docker/service/certificate/run
cmd.run:
- name: |
- # These dirs are not to CentOS-ish, but this is a helper script
+ # These dirs are not to
o
CentOS-ish, but this is a helper script
# and they should be enough
/bin/bash -c "mkdir -p /etc/ssl/certs/ /etc/ssl/private/ && \
openssl req \
# and they should be enough
/bin/bash -c "mkdir -p /etc/ssl/certs/ /etc/ssl/private/ && \
openssl req \
@@
-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:
- 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 }}.ke
y
+ - file: extra_custom_certs_
{{ vh }}_cert_file_copy
+ - file: extra_custom_certs_
{{ vh }}_key_file_cop
y
{%- if grains.get('os_family') == 'Debian' %}
extra_snakeoil_certs_certs_permissions_{{ vh}}_cmd_run:
{%- if grains.get('os_family') == 'Debian' %}
extra_snakeoil_certs_certs_permissions_{{ vh}}_cmd_run: