Commit 955a6e7f authored by Francesco Gionghi's avatar Francesco Gionghi
Browse files

fixing import map.jinja

parent a0e68e7a
{#- Get the `tplroot` from `tpldir` #} {#- Get the `tplroot` from `tpldir` #}
{%- set fbkusersroot = slspath.split('/')[0] %} {%- 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 %} {% if pillar.fbkusers is defined %}
......
{#- Get the `tplroot` from `tpldir` #} {#- Get the `tplroot` from `tpldir` #}
{%- set fbkusersroot = slspath.split('/')[0] %} {%- 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 %} {% if pillar.fbkusers is defined %}
{% for user, options in fbkusers %} {% for user, options in fbkusers %}
......
{#- Get the `tplroot` from `tpldir` #} {#- Get the `tplroot` from `tpldir` #}
{%- set fbkusersroot = slspath.split('/')[0] %} {%- 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 %} {% if pillar.fbkusers is defined %}
{% for user, options in fbkusers %} {% for user, options in fbkusers %}
......
...@@ -46,5 +46,5 @@ ...@@ -46,5 +46,5 @@
) )
%} %}
{%- set fbkusers = config %} {%- set fbkusers-settings = config %}
{#- Get the `tplroot` from `tpldir` #} {#- Get the `tplroot` from `tpldir` #}
{%- set fbkusersroot = slspath.split('/')[0] %} {%- 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 %} {% if pillar.fbkusers is defined %}
{% for user, options in fbkusers %} {% for user, options in fbkusers %}
......
{#- Get the `tplroot` from `tpldir` #} {#- Get the `tplroot` from `tpldir` #}
{%- set fbkusersroot = slspath.split('/')[0] %} {%- 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 %} {% if pillar.fbkusers is defined %}
{% for user, options in fbkusers %} {% for user, options in fbkusers %}
......
{#- Get the `tplroot` from `tpldir` #} {#- Get the `tplroot` from `tpldir` #}
{%- set fbkusersroot = slspath.split('/')[0] %} {%- 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 %} {% if pillar.fbkusers is defined %}
{% for user, options in fbkusers %} {% for user, options in fbkusers %}
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
- defaults: - defaults:
user: {{ user }} user: {{ user }}
service: {{ service }} service: {{ service }}
servicecmd: {{ fbkusers['systemctl'] }} servicecmd: {{ fbkusers-settings['systemctl'] }}
/etc/sudoers.d/{{ user }}-{{ service }}: /etc/sudoers.d/{{ user }}-{{ service }}:
file.managed: file.managed:
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
- defaults: - defaults:
user: {{ user }} user: {{ user }}
service: {{ service }} service: {{ service }}
servicecmd: {{ fbkusers['systemctl'] }} servicecmd: {{ fbkusers-settings['systemctl'] }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment