fixing import map.jinja

fbkusers/createuser/createuser.sls

 
 {#- Get the `tplroot` from `tpldir` #}
 {%- set fbkusersroot = slspath.split('/')[0] %}
-{%- from fbkusersroot ~ "/map.jinja" import fbkusers with context %}
+{%- from fbkusersroot ~ "/map.jinja" import fbkusers-settings with context %}
 
 
 {% if pillar.fbkusers is defined %}

fbkusers/fsperm/fsperm.sls

 
 {#- Get the `tplroot` from `tpldir` #}
 {%- set fbkusersroot = slspath.split('/')[0] %}
-{%- from fbkusersroot ~ "/map.jinja" import fbkusers with context %}
+{%- from fbkusersroot ~ "/map.jinja" import fbkusers-settings with context %}
 
 {% if pillar.fbkusers is defined %}
 {% for user, options in fbkusers %}

fbkusers/group/groups.sls

 
 {#- Get the `tplroot` from `tpldir` #}
 {%- set fbkusersroot = slspath.split('/')[0] %}
-{%- from fbkusersroot ~ "/map.jinja" import fbkusers with context %}
+{%- from fbkusersroot ~ "/map.jinja" import fbkusers-settings with context %}
 
 {% if pillar.fbkusers is defined %}
 {% for user, options in fbkusers %}

fbkusers/map.jinja

@@ -46,5 +46,5 @@
     )
 %}
 
-{%- set fbkusers = config %}
+{%- set fbkusers-settings = config %}
 

fbkusers/sshkey/sshkey.sls

 
 {#- Get the `tplroot` from `tpldir` #}
 {%- set fbkusersroot = slspath.split('/')[0] %}
-{%- from fbkusersroot ~ "/map.jinja" import fbkusers with context %}
+{%- from fbkusersroot ~ "/map.jinja" import fbkusers-settings with context %}
 
 {% if pillar.fbkusers is defined %}
 {% for user, options in fbkusers %}

fbkusers/sudo/sudocmd.sls

 
 {#- Get the `tplroot` from `tpldir` #}
 {%- set fbkusersroot = slspath.split('/')[0] %}
-{%- from fbkusersroot ~ "/map.jinja" import fbkusers with context %}
+{%- from fbkusersroot ~ "/map.jinja" import fbkusers-settings with context %}
 
 {% if pillar.fbkusers is defined %}
 {% for user, options in fbkusers %}

fbkusers/sudo/sudoservice.sls

 
 {#- Get the `tplroot` from `tpldir` #}
 {%- set fbkusersroot = slspath.split('/')[0] %}
-{%- from fbkusersroot ~ "/map.jinja" import fbkusers with context %}
+{%- from fbkusersroot ~ "/map.jinja" import fbkusers-settings with context %}
 
 {% if pillar.fbkusers is defined %}
 {% for user, options in fbkusers %}
@@ -17,7 +17,7 @@
     - defaults:
           user: {{ user }}
           service: {{ service }}
-          servicecmd: {{ fbkusers['systemctl'] }}
+          servicecmd: {{ fbkusers-settings['systemctl'] }}
 
 /etc/sudoers.d/{{ user }}-{{ service }}:
   file.managed:
@@ -26,7 +26,7 @@
     - defaults:
           user: {{ user }}
           service: {{ service }}
-          servicecmd: {{ fbkusers['systemctl'] }}
+          servicecmd: {{ fbkusers-settings['systemctl'] }}
 
 {% endfor %}
 {% endif %}