From 92ef52bcfe969dd0b88987accfa65d6468f9f851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Perell=C3=B3=20Mar=C3=ADn?= Date: Sun, 23 Mar 2014 10:33:12 +0000 Subject: [PATCH] Removed quotes from map.user and map.group variables Conflicts: bind/config.sls --- bind/config.sls | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/bind/config.sls b/bind/config.sls index e8a86a1..b6fd090 100644 --- a/bind/config.sls +++ b/bind/config.sls @@ -6,8 +6,8 @@ include: named_directory: file.directory: - name: {{ map.named_directory }} - - user: {{ salt['pillar.get']('bind:config:user', 'map.user') }} - - group: {{ salt['pillar.get']('bind:config:group', 'map.group') }} + - user: {{ salt['pillar.get']('bind:config:user', map.user) }} + - group: {{ salt['pillar.get']('bind:config:group', map.group) }} - mode: 775 - makedirs: True - require: @@ -34,8 +34,8 @@ bind_local_config: - name: {{ map.local_config }} - source: 'salt://bind/files/redhat/named.conf.local' - template: jinja - - user: {{ salt['pillar.get']('bind:config:user', 'map.user') }} - - group: {{ salt['pillar.get']('bind:config:group', 'map.group') }} + - user: {{ salt['pillar.get']('bind:config:user', map.user) }} + - group: {{ salt['pillar.get']('bind:config:group', map.group) }} - mode: {{ salt['pillar.get']('bind:config:mode', '644') }} - require: - pkg: bind @@ -52,7 +52,7 @@ bind_config: - template: jinja - user: {{ salt['pillar.get']('bind:config:user', map.user) }} - group: {{ salt['pillar.get']('bind:config:group', map.group) }} - - mode: {{ salt['pillar.get']('bind:config:mode', '640') }} + - mode: {{ salt['pillar.get']('bind:config:mode', '644') }} - require: - pkg: bind - watch_in: @@ -64,8 +64,8 @@ bind_local_config: - name: {{ map.local_config }} - source: 'salt://bind/files/debian/named.conf.local' - template: jinja - - user: {{ salt['pillar.get']('bind:config:user', 'map.user') }} - - group: {{ salt['pillar.get']('bind:config:group', 'map.group') }} + - user: {{ salt['pillar.get']('bind:config:user', map.user) }} + - group: {{ salt['pillar.get']('bind:config:group', map.group) }} - mode: {{ salt['pillar.get']('bind:config:mode', '644') }} - require: - pkg: bind @@ -78,8 +78,8 @@ bind_options_config: - name: {{ map.options_config }} - source: 'salt://bind/files/debian/named.conf.options' - template: jinja - - user: {{ salt['pillar.get']('bind:config:user', 'map.user') }} - - group: {{ salt['pillar.get']('bind:config:group', 'map.group') }} + - user: {{ salt['pillar.get']('bind:config:user', map.user) }} + - group: {{ salt['pillar.get']('bind:config:group', map.group) }} - mode: {{ salt['pillar.get']('bind:config:mode', '644') }} - require: - pkg: bind @@ -92,8 +92,8 @@ bind_default_zones: - name: {{ map.default_zones_config }} - source: 'salt://bind/files/debian/named.conf.default-zones' - template: jinja - - user: {{ salt['pillar.get']('bind:config:user', 'map.user') }} - - group: {{ salt['pillar.get']('bind:config:group', 'map.group') }} + - user: {{ salt['pillar.get']('bind:config:user', map.user) }} + - group: {{ salt['pillar.get']('bind:config:group', map.group) }} - mode: {{ salt['pillar.get']('bind:config:mode', '644') }} - require: - pkg: bind @@ -116,8 +116,8 @@ zones-{{ file }}: - managed - name: {{ map.named_directory }}/{{ file }} - source: 'salt://bind/zones/{{ file }}' - - user: {{ salt['pillar.get']('bind:config:user', 'map.user') }} - - group: {{ salt['pillar.get']('bind:config:group', 'map.group') }} + - user: {{ salt['pillar.get']('bind:config:user', map.user) }} + - group: {{ salt['pillar.get']('bind:config:group', map.group) }} - mode: {{ salt['pillar.get']('bind:config:mode', '644') }} - watch_in: - service: bind