refactor(sls): align to template-formula: use tplroot

saltstack-formulas · Oct 20, 2020 · a3a19f5 · a3a19f5
1 parent 848c573
commit a3a19f5
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/diaspora/config.sls b/diaspora/config.sls
@@ -1,4 +1,9 @@
-{%- from "diaspora/map.jinja" import diaspora with context %}
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+{#- Get the `tplroot` from `tpldir` #}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- from tplroot ~ "/map.jinja" import diaspora with context %}
 
 {{ diaspora.install_path }}/config/database.yml:
   file.managed:

diff --git a/diaspora/init.sls b/diaspora/init.sls
@@ -1,4 +1,4 @@
 include:
-  - diaspora.install
-  - diaspora.config
-  - diaspora.service
+  - .install
+  - .config
+  - .service
diff --git a/diaspora/install.sls b/diaspora/install.sls
@@ -1,8 +1,13 @@
-{%- from "diaspora/map.jinja" import diaspora with context %}
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+{#- Get the `tplroot` from `tpldir` #}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- from tplroot ~ "/map.jinja" import diaspora with context %}
 {%- set environment = diaspora.configuration.server.rails_environment %}
 
 include:
-  - diaspora.config
+  - {{ tplroot }}.config
 
 {%- if grains.os == 'CentOS' and grains.osmajorrelease >= 8 %}
 diaspora_centos_enable_powertools_repo:

diff --git a/diaspora/service.sls b/diaspora/service.sls
@@ -1,8 +1,13 @@
-{%- from "diaspora/map.jinja" import diaspora with context %}
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+{#- Get the `tplroot` from `tpldir` #}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- from tplroot ~ "/map.jinja" import diaspora with context %}
 
 include:
-  - diaspora.install
-  - diaspora.config
+  - {{ tplroot }}.install
+  - {{ tplroot }}.config
 
 /etc/systemd/system/diaspora-sidekiq.service:
   file.managed: