refactor(topdir): use for include and require except init.sls

myii · myii · commit a218e914bc34 · 2019-02-28T00:48:00.000Z
* Make all `init.sls` imports relative since unnecessary there
diff --git a/template/init.sls b/template/init.sls
@@ -2,4 +2,4 @@
 # vim: ft=sls
 
 include:
-  - template.pkg
+  - .pkg
diff --git a/template/pkg/config.sls b/template/pkg/config.sls
@@ -7,7 +7,7 @@
 {%- from topdir ~ "/macros.jinja" import files_switch with context %}
 
 include:
-  - .install
+  - {{ topdir }}.pkg.install
 
 template-config:
   file.managed:
@@ -23,4 +23,4 @@ template-config:
     - group: root
     - template: jinja
     - require:
-      - sls: {{ tpldot }}.install
+      - sls: {{ topdir }}.pkg.install
diff --git a/template/pkg/service.sls b/template/pkg/service.sls
@@ -6,11 +6,11 @@
 {%- from topdir ~ "/map.jinja" import template with context %}
 
 include:
-  - .config
+  - {{ topdir }}.pkg.config
 
 template-service:
   service.running:
     - name: {{ template.service.name }}
     - enable: True
     - require:
-      - sls: {{ tpldot }}.config
+      - sls: {{ topdir }}.pkg.config
