refactor(pkg): move pkg related components into separate directory

myii · Feb 28, 2019 · c21f82b · c21f82b
1 parent be780db
commit c21f82b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/template/init.sls b/template/init.sls
@@ -2,6 +2,4 @@
 # vim: ft=sls
 
 include:
-  - template.install
-  - template.config
-  - template.service
+  - template.pkg
diff --git a/template/config.sls → template/pkg/config.sls b/template/config.sls → template/pkg/config.sls
@@ -2,11 +2,11 @@
 # vim: ft=sls
 
 {%- set topdir = tpldir.split('/')[0] %}
-{%- from tpldir ~ "/map.jinja" import template with context %}
-{%- from tpldir ~ "/macros.jinja" import files_switch with context %}
+{%- from salt['file.dirname'](tpldir) ~ "/map.jinja" import template with context %}
+{%- from salt['file.dirname'](tpldir) ~ "/macros.jinja" import files_switch with context %}
 
 include:
-  - template.install
+  - .install
 
 template-config:
   file.managed:

diff --git a/template/pkg/init.sls b/template/pkg/init.sls
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+include:
+  - .install
+  - .config
+  - .service
diff --git a/template/install.sls → template/pkg/install.sls b/template/install.sls → template/pkg/install.sls
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
-{%- from tpldir ~ "/map.jinja" import template with context %}
+{%- from salt['file.dirname'](tpldir) ~ "/map.jinja" import template with context %}
 
 template-pkg:
   pkg.installed:

diff --git a/template/service.sls → template/pkg/service.sls b/template/service.sls → template/pkg/service.sls
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
-{%- from tpldir ~ "/map.jinja" import template with context %}
+{%- from salt['file.dirname'](tpldir) ~ "/map.jinja" import template with context %}
 
 include:
-  - template.config
+  - .config
 
 template-name:
   service.running: