Pārlūkot izejas kodu

Merge pull request #9 from tcpcloud/acl

Fix ACL generation condition
tags/2016.12
Filip Pytloun pirms 8 gadiem
vecāks
revīzija
bd1bbeebfe
1 mainītis faili ar 5 papildinājumiem un 2 dzēšanām
  1. +5
    -2
      salt/master/service.sls

+ 5
- 2
salt/master/service.sls Parādīt failu

@@ -28,7 +28,7 @@ salt_master_packages:
- watch_in:
- service: salt_master_service

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

/etc/salt/master.d/_acl.conf:
file.managed:
@@ -40,6 +40,10 @@ salt_master_packages:
- watch_in:
- service: salt_master_service

{%- endif %}

{%- if master.peer is defined %}

/etc/salt/master.d/_peer.conf:
file.managed:
- source: salt://salt/files/_peer.conf
@@ -50,7 +54,6 @@ salt_master_packages:
- watch_in:
- service: salt_master_service


{%- endif %}

salt_master_service:

Notiek ielāde…
Atcelt
Saglabāt