[arvados] updated: 2.5.0-123-gd4093dea5

git repository hosting git at public.arvados.org
Tue Feb 14 15:20:45 UTC 2023


Summary of changes:
 .../config_examples/multi_host/aws/states/ssl_key_encrypted.sls  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

       via  d4093dea56055b8630b4ba4ca04ad0c891770db8 (commit)
      from  e1577a7fbba344f1c7d784d085d5f8b099bc28bf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit d4093dea56055b8630b4ba4ca04ad0c891770db8
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date:   Tue Feb 14 12:19:42 2023 -0300

    20035: Add missing jinja vars quoting on systemd's unit file template.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>

diff --git a/tools/salt-install/config_examples/multi_host/aws/states/ssl_key_encrypted.sls b/tools/salt-install/config_examples/multi_host/aws/states/ssl_key_encrypted.sls
index d616398a0..a387a6dc2 100644
--- a/tools/salt-install/config_examples/multi_host/aws/states/ssl_key_encrypted.sls
+++ b/tools/salt-install/config_examples/multi_host/aws/states/ssl_key_encrypted.sls
@@ -21,7 +21,10 @@ extra_ssl_key_encrypted_password_retrieval_script:
     - contents: |
         #!/bin/bash
 
-        # RUNTIME_DIRECTORY is provided by systemd
+        # RUNTIME_DIRECTORY is provided by systemd.
+        # NOTE: We assume systemd's set up in a way that there's just one
+        # runtime dir for this particular unit, otherwise this variable could
+        # contain multiple paths separated by a colon.
         PASSWORD_FILE="${RUNTIME_DIRECTORY}/{{ ssl_key_encrypted.privkey_password_filename }}"
 
         while [ true ]; do
@@ -47,8 +50,8 @@ extra_ssl_key_encrypted_password_retrieval_service_unit:
         After=network.target
         [Service]
         RuntimeDirectory=arvados
-        ExecStartPre=/usr/bin/mkfifo --mode=0600 %t/arvados/{{ ssl_key_encrypted.privkey_password_filename }}
-        ExecStart=/bin/bash {{ ssl_key_encrypted.privkey_password_script }}
+        ExecStartPre={{ ('/usr/bin/mkfifo --mode=0600 %t/arvados/' ~ ssl_key_encrypted.privkey_password_filename) | yaml_dquote }}
+        ExecStart={{ ('/bin/bash ' ~ ssl_key_encrypted.privkey_password_script) | yaml_dquote }}
         [Install]
         WantedBy=multi-user.target
 

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list