Merge pull request #36 from Perceptyx/remove_dashes_from_variables
Remove dashes from variables.
This commit is contained in:
commit
10d7127c9a
3 changed files with 5 additions and 5 deletions
|
@ -18,5 +18,5 @@ include:
|
||||||
included: True
|
included: True
|
||||||
sudoers: {{ spec|json }}
|
sudoers: {{ spec|json }}
|
||||||
- require:
|
- require:
|
||||||
- file: {{ sudoers.get('config-path', '/etc') }}/sudoers
|
- file: {{ sudoers.get('configpath', '/etc') }}/sudoers
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
|
@ -4,14 +4,14 @@ sudo:
|
||||||
pkg.installed:
|
pkg.installed:
|
||||||
- name: {{ sudoers.pkg }}
|
- name: {{ sudoers.pkg }}
|
||||||
|
|
||||||
{{ sudoers.get('config-path', '/etc') }}/sudoers:
|
{{ sudoers.get('configpath', '/etc') }}/sudoers:
|
||||||
file.managed:
|
file.managed:
|
||||||
- user: root
|
- user: root
|
||||||
- group: {{ sudoers.get('group', 'root') }}
|
- group: {{ sudoers.get('group', 'root') }}
|
||||||
- mode: 440
|
- mode: 440
|
||||||
- template: jinja
|
- template: jinja
|
||||||
- source: salt://sudoers/files/sudoers
|
- source: salt://sudoers/files/sudoers
|
||||||
- check_cmd: {{ sudoers.get('exec-prefix', '/usr/sbin') }}/visudo -c -f
|
- check_cmd: {{ sudoers.get('execprefix', '/usr/sbin') }}/visudo -c -f
|
||||||
- context:
|
- context:
|
||||||
included: False
|
included: False
|
||||||
- require:
|
- require:
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
'Arch': {'pkg': 'sudo'},
|
'Arch': {'pkg': 'sudo'},
|
||||||
'Suse': {'pkg': 'sudo'},
|
'Suse': {'pkg': 'sudo'},
|
||||||
'FreeBSD': {'pkg': 'sudo',
|
'FreeBSD': {'pkg': 'sudo',
|
||||||
'config-path': '/usr/local/etc',
|
'configpath': '/usr/local/etc',
|
||||||
'exec-prefix': '/usr/local/sbin',
|
'execprefix': '/usr/local/sbin',
|
||||||
'group': 'wheel'},
|
'group': 'wheel'},
|
||||||
}, merge=salt['pillar.get']('sudoers:lookup')) %}
|
}, merge=salt['pillar.get']('sudoers:lookup')) %}
|
||||||
|
|
Loading…
Reference in a new issue