refactor(meta-state): use computed name when referencing substates

faudebert · faudebert · commit 4f117cda7149 · 2020-07-01T18:59:44.000+02:00
Allow to rename the meta-state without having to change substates
references. This might be useful one wants to use this formula with a
(renamed) fork within the same environment.
diff --git a/nginx/certificates.sls b/nginx/certificates.sls
@@ -2,7 +2,7 @@
 {%- from tplroot ~ '/map.jinja' import nginx with context %}
 
 include:
-  - nginx.service
+  - {{ tplroot }}.service
 
 prepare_certificates_path_dir:
   file.directory:
diff --git a/nginx/common.sls b/nginx/common.sls
@@ -1,2 +1,4 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+
 include:
-  - nginx.deprecated
+  - {{ tplroot }}.deprecated
diff --git a/nginx/init.sls b/nginx/init.sls
@@ -7,15 +7,15 @@
 
 include:
   {%- if nginx.ng is defined %}
-  - nginx.deprecated
+  - {{ tplroot }}.deprecated
   {%- endif %}
-  - nginx.config
-  - nginx.service
+  - {{ tplroot }}.config
+  - {{ tplroot }}.service
   {%- if nginx.snippets is defined %}
-  - nginx.snippets
+  - {{ tplroot }}.snippets
   {%- endif %}
-  - nginx.servers
-  - nginx.certificates
+  - {{ tplroot }}.servers
+  - {{ tplroot }}.certificates
 
 extend:
   nginx_service:
diff --git a/nginx/luajit2.sls b/nginx/luajit2.sls
@@ -1,2 +1,4 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+
 include:
-  - nginx.deprecated
+  - {{ tplroot }}.deprecated
diff --git a/nginx/ng/certificates.sls b/nginx/ng/certificates.sls
@@ -1,2 +1,4 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+
 include:
-  - nginx.deprecated
+  - {{ tplroot }}.deprecated
diff --git a/nginx/ng/config.sls b/nginx/ng/config.sls
@@ -1,2 +1,4 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+
 include:
-  - nginx.deprecated
+  - {{ tplroot }}.deprecated
diff --git a/nginx/ng/init.sls b/nginx/ng/init.sls
@@ -1,2 +1,4 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+
 include:
-  - nginx.deprecated
+  - {{ tplroot }}.deprecated
diff --git a/nginx/ng/passenger.sls b/nginx/ng/passenger.sls
@@ -1,2 +1,4 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+
 include:
-  - nginx.deprecated
+  - {{ tplroot }}.deprecated
diff --git a/nginx/ng/pkg.sls b/nginx/ng/pkg.sls
@@ -1,2 +1,4 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+
 include:
-  - nginx.deprecated
+  - {{ tplroot }}.deprecated
diff --git a/nginx/ng/servers.sls b/nginx/ng/servers.sls
@@ -1,2 +1,4 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+
 include:
-  - nginx.deprecated
+  - {{ tplroot }}.deprecated
diff --git a/nginx/ng/servers_config.sls b/nginx/ng/servers_config.sls
@@ -1,2 +1,4 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+
 include:
-  - nginx.deprecated
+  - {{ tplroot }}.deprecated
diff --git a/nginx/ng/service.sls b/nginx/ng/service.sls
@@ -1,2 +1,4 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+
 include:
-  - nginx.deprecated
+  - {{ tplroot }}.deprecated
diff --git a/nginx/ng/snippets.sls b/nginx/ng/snippets.sls
@@ -1,2 +1,4 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+
 include:
-  - nginx.deprecated
+  - {{ tplroot }}.deprecated
diff --git a/nginx/ng/src.sls b/nginx/ng/src.sls
@@ -1,2 +1,4 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+
 include:
-  - nginx.deprecated
+  - {{ tplroot }}.deprecated
diff --git a/nginx/openresty.sls b/nginx/openresty.sls
@@ -1,2 +1,4 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+
 include:
-  - nginx.deprecated
+  - {{ tplroot }}.deprecated
diff --git a/nginx/package.sls b/nginx/package.sls
@@ -1,2 +1,4 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+
 include:
-  - nginx.deprecated
+  - {{ tplroot }}.deprecated
diff --git a/nginx/passenger.sls b/nginx/passenger.sls
@@ -9,14 +9,14 @@
 
 {% if salt['grains.get']('os_family') in ['Debian', 'RedHat'] %}
 include:
-  - nginx.pkg
-  - nginx.config
-  - nginx.service
+  - {{ tplroot }}.pkg
+  - {{ tplroot }}.config
+  - {{ tplroot }}.service
   {%- if nginx.snippets is defined %}
-  - nginx.snippets
+  - {{ tplroot }}.snippets
   {%- endif %}
-  - nginx.servers
-  - nginx.certificates
+  - {{ tplroot }}.servers
+  - {{ tplroot }}.certificates
 
 passenger_install:
   pkg.installed:
diff --git a/nginx/servers.sls b/nginx/servers.sls
@@ -14,8 +14,8 @@
 {% endmacro %}
 
 include:
-  - nginx.service
-  - nginx.servers_config
+  - {{ tplroot }}.service
+  - {{ tplroot }}.servers_config
 
 {% if server_states|length() > 0 %}
 nginx_service_reload:
diff --git a/nginx/service.sls b/nginx/service.sls
@@ -10,9 +10,9 @@
 
 include:
   {% if nginx.install_from_source %}
-  - nginx.src
+  - {{ tplroot }}.src
   {% else %}
-  - nginx.pkg
+  - {{ tplroot }}.pkg
   {% endif %}
 
 {% if nginx.install_from_source %}
@@ -32,9 +32,9 @@ nginx_service:
     - enable: {{ nginx.service.enable }}
     - require:
       {% if nginx.install_from_source %}
-      - sls: nginx.src
+      - sls: {{ tplroot }}.src
       {% else %}
-      - sls: nginx.pkg
+      - sls: {{ tplroot }}.pkg
       {% endif %}
     - listen:
       {% if nginx.install_from_source %}
diff --git a/nginx/source.sls b/nginx/source.sls
@@ -1,2 +1,4 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+
 include:
-  - nginx.deprecated
+  - {{ tplroot }}.deprecated
diff --git a/nginx/sysvinit.sls b/nginx/sysvinit.sls
@@ -1,2 +1,4 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+
 include:
-  - nginx.deprecated
+  - {{ tplroot }}.deprecated
diff --git a/nginx/upstart.sls b/nginx/upstart.sls
@@ -1,2 +1,4 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+
 include:
-  - nginx.deprecated
+  - {{ tplroot }}.deprecated
diff --git a/nginx/users.sls b/nginx/users.sls
@@ -1,2 +1,4 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+
 include:
-  - nginx.deprecated
+  - {{ tplroot }}.deprecated
