Browse Source

temp fix on git executable

tags/v0.45.0
Sonia Hamilton 8 years ago
parent
commit
e81f6e695c
1 changed files with 13 additions and 6 deletions
  1. +13
    -6
      users/init.sls

+ 13
- 6
users/init.sls View File

@@ -430,12 +430,20 @@ users_googleauth-{{ svc }}-{{ name }}:
{%- endfor %}
{%- endif %}

#
# if not salt['cmd.has_exec']('git')
# fails even if git is installed
#
# this doesn't work (Salt bug), therefore need to run state.apply twice
#include:
# - users
#
#git:
# pkg.installed:
# - require_in:
# - sls: users
#
{% if 'gitconfig' in user %}
{% if not salt['cmd.has_exec']('git') %}
skip_{{ name }}_gitconfig_since_git_not_installed:
test.fail_without_changes:
- name: "Git configuration for user {{ name }} has been skipped because Git is not installed."
{% else %}
{% for key, value in user['gitconfig'].items() %}
users_{{ name }}_user_gitconfig_{{ loop.index0 }}:
{% if grains['saltversioninfo'] >= (2015, 8, 0, 0) %}
@@ -453,7 +461,6 @@ users_{{ name }}_user_gitconfig_{{ loop.index0 }}:
{% endif %}
{% endfor %}
{% endif %}
{% endif %}

{% endfor %}


Loading…
Cancel
Save