mirror of
https://github.com/saltstack-formulas/users-formula.git
synced 2024-11-27 22:38:34 +01:00
temp fix on git executable
This commit is contained in:
parent
bd4ffe5f5b
commit
e81f6e695c
@ -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…
Reference in New Issue
Block a user