X-Git-Url: https://git.arvados.org/arvados-formula.git/blobdiff_plain/5e2db4ee2a9c5ac0b60dc9734d0f48bb68ca7b84:/test/salt/states/example_add_snakeoil_certs/init.sls..fa49dbe:/test/salt/states/examples/single_host/snakeoil_certs.sls

diff --git a/test/salt/states/example_add_snakeoil_certs/init.sls b/test/salt/states/examples/single_host/snakeoil_certs.sls
similarity index 61%
rename from test/salt/states/example_add_snakeoil_certs/init.sls
rename to test/salt/states/examples/single_host/snakeoil_certs.sls
index 158abcc..b76bdce 100644
--- a/test/salt/states/example_add_snakeoil_certs/init.sls
+++ b/test/salt/states/examples/single_host/snakeoil_certs.sls
@@ -3,9 +3,11 @@
 {%- from "arvados/map.jinja" import arvados with context %}
 {%- set tpldir = curr_tpldir %}
 
-snake_oil_certs:
+arvados_test_salt_states_examples_single_host_snakeoil_certs_openssl_pkg_installed:
   pkg.installed:
     - name: openssl
+
+arvados_test_salt_states_examples_single_host_snakeoil_certs_arvados_snake_oil_cert_cmd_run:
   cmd.run:
     - name: |
         cat > /tmp/openssl.cnf <<-CNF
@@ -31,7 +33,6 @@ snake_oil_certs:
         {%- endfor %}
         {%- for entry in [
             'keep',
-            'keep0',
             'collections',
             'download',
             'ws',
@@ -45,16 +46,16 @@ snake_oil_certs:
 
         mkdir -p /etc/ssl/certs/  /etc/ssl/private/ && \
         openssl req -config /tmp/openssl.cnf -new -x509 -days 3650 -nodes -sha256 \
-          -out /etc/ssl/certs/ssl-cert-snakeoil.pem \
-          -keyout /etc/ssl/private/ssl-cert-snakeoil.key > /tmp/snake_oil_certs.output 2>&1 && \
-        chmod 0644 /etc/ssl/certs/ssl-cert-snakeoil.pem && \
-        chmod 0640 /etc/ssl/private/ssl-cert-snakeoil.key
-    - unless: test -f /etc/ssl/private/ssl-cert-snakeoil.key
+          -out /etc/ssl/certs/arvados-snakeoil-cert.pem \
+          -keyout /etc/ssl/private/arvados-snakeoil-cert.key > /tmp/snake_oil_certs.output 2>&1 && \
+        chmod 0644 /etc/ssl/certs/arvados-snakeoil-cert.pem && \
+        chmod 0640 /etc/ssl/private/arvados-snakeoil-cert.key
+    - unless: test -f /etc/ssl/private/arvados-snakeoil-cert.key
     - require:
-      - pkg: openssl
+      - pkg: arvados_test_salt_states_examples_single_host_snakeoil_certs_openssl_pkg_installed
 
 {%- if grains.get('os_family') == 'Debian' %}
-ssl_certs:
+arvados_test_salt_states_examples_single_host_snakeoil_certs_ssl_cert_pkg_installed:
   pkg.installed:
     - name: ssl-cert
     - require_in:
@@ -63,7 +64,8 @@ ssl_certs:
 snake_oil_certs_permissions:
   cmd.run:
     - name: |
-        chown root:ssl-cert /etc/ssl/private/ssl-cert-snakeoil.key
+        chown root:ssl-cert /etc/ssl/private/arvados-snakeoil-cert.key
     - require:
-      - pkg: ssl_certs
+      - cmd: arvados_test_salt_states_examples_single_host_snakeoil_certs_arvados_snake_oil_cert_cmd_run
+      - pkg: arvados_test_salt_states_examples_single_host_snakeoil_certs_ssl_cert_pkg_installed
 {%- endif %}