X-Git-Url: https://git.arvados.org/arvados-formula.git/blobdiff_plain/cbabd4188c1200866ef7ac01e1ab57a58b8775bc..06050e0a5377d3d6a4c54c7f50fe53a06a07c837:/arvados/config/file.sls

diff --git a/arvados/config/file.sls b/arvados/config/file.sls
index 463d5b3..9860797 100644
--- a/arvados/config/file.sls
+++ b/arvados/config/file.sls
@@ -3,26 +3,20 @@
 
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
-{%- set sls_package_install = tplroot ~ '.package.install' %}
 {%- from tplroot ~ "/map.jinja" import arvados with context %}
 {%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
 
-include:
-  - {{ sls_package_install }}
-
 arvados-config-file-file-managed:
   file.managed:
-    - name: {{ arvados.config }}
-    - source: {{ files_switch(['example.tmpl'],
+    - name: {{ arvados.config.file }}
+    - source: {{ files_switch(['config.tmpl', 'config.tmpl.jinja'],
                               lookup='arvados-config-file-file-managed'
                  )
               }}
-    - mode: 644
-    - user: root
-    - group: {{ arvados.rootgroup }}
+    - mode: {{ arvados.config.mode }}
+    - user: {{ arvados.config.user }}
+    - group: {{ arvados.config.group }}
     - makedirs: True
     - template: jinja
-    - require:
-      - sls: {{ sls_package_install }}
     - context:
         arvados: {{ arvados | json }}