Browse Source

Merge pull request #9 from tcpcloud/acl

Fix ACL generation condition
tags/2016.12
Filip Pytloun 8 years ago
parent
commit
bd1bbeebfe
1 changed files with 5 additions and 2 deletions
  1. +5
    -2
      salt/master/service.sls

+ 5
- 2
salt/master/service.sls View File

- watch_in: - watch_in:
- service: salt_master_service - service: salt_master_service


{%- if master.peer is defined %}
{%- if master.user is defined %}


/etc/salt/master.d/_acl.conf: /etc/salt/master.d/_acl.conf:
file.managed: file.managed:
- watch_in: - watch_in:
- service: salt_master_service - service: salt_master_service


{%- endif %}

{%- if master.peer is defined %}

/etc/salt/master.d/_peer.conf: /etc/salt/master.d/_peer.conf:
file.managed: file.managed:
- source: salt://salt/files/_peer.conf - source: salt://salt/files/_peer.conf
- watch_in: - watch_in:
- service: salt_master_service - service: salt_master_service



{%- endif %} {%- endif %}


salt_master_service: salt_master_service:

Loading…
Cancel
Save