mirror of
https://github.com/saltstack-formulas/bind-formula.git
synced 2025-04-16 09:40:22 +00:00
Removed quotes from map.user and map.group variables
Conflicts: bind/config.sls
This commit is contained in:
parent
50e812677d
commit
92ef52bcfe
1 changed files with 13 additions and 13 deletions
|
@ -6,8 +6,8 @@ include:
|
||||||
named_directory:
|
named_directory:
|
||||||
file.directory:
|
file.directory:
|
||||||
- name: {{ map.named_directory }}
|
- name: {{ map.named_directory }}
|
||||||
- user: {{ salt['pillar.get']('bind:config:user', 'map.user') }}
|
- user: {{ salt['pillar.get']('bind:config:user', map.user) }}
|
||||||
- group: {{ salt['pillar.get']('bind:config:group', 'map.group') }}
|
- group: {{ salt['pillar.get']('bind:config:group', map.group) }}
|
||||||
- mode: 775
|
- mode: 775
|
||||||
- makedirs: True
|
- makedirs: True
|
||||||
- require:
|
- require:
|
||||||
|
@ -34,8 +34,8 @@ bind_local_config:
|
||||||
- name: {{ map.local_config }}
|
- name: {{ map.local_config }}
|
||||||
- source: 'salt://bind/files/redhat/named.conf.local'
|
- source: 'salt://bind/files/redhat/named.conf.local'
|
||||||
- template: jinja
|
- template: jinja
|
||||||
- user: {{ salt['pillar.get']('bind:config:user', 'map.user') }}
|
- user: {{ salt['pillar.get']('bind:config:user', map.user) }}
|
||||||
- group: {{ salt['pillar.get']('bind:config:group', 'map.group') }}
|
- group: {{ salt['pillar.get']('bind:config:group', map.group) }}
|
||||||
- mode: {{ salt['pillar.get']('bind:config:mode', '644') }}
|
- mode: {{ salt['pillar.get']('bind:config:mode', '644') }}
|
||||||
- require:
|
- require:
|
||||||
- pkg: bind
|
- pkg: bind
|
||||||
|
@ -52,7 +52,7 @@ bind_config:
|
||||||
- template: jinja
|
- template: jinja
|
||||||
- user: {{ salt['pillar.get']('bind:config:user', map.user) }}
|
- user: {{ salt['pillar.get']('bind:config:user', map.user) }}
|
||||||
- group: {{ salt['pillar.get']('bind:config:group', map.group) }}
|
- 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:
|
- require:
|
||||||
- pkg: bind
|
- pkg: bind
|
||||||
- watch_in:
|
- watch_in:
|
||||||
|
@ -64,8 +64,8 @@ bind_local_config:
|
||||||
- name: {{ map.local_config }}
|
- name: {{ map.local_config }}
|
||||||
- source: 'salt://bind/files/debian/named.conf.local'
|
- source: 'salt://bind/files/debian/named.conf.local'
|
||||||
- template: jinja
|
- template: jinja
|
||||||
- user: {{ salt['pillar.get']('bind:config:user', 'map.user') }}
|
- user: {{ salt['pillar.get']('bind:config:user', map.user) }}
|
||||||
- group: {{ salt['pillar.get']('bind:config:group', 'map.group') }}
|
- group: {{ salt['pillar.get']('bind:config:group', map.group) }}
|
||||||
- mode: {{ salt['pillar.get']('bind:config:mode', '644') }}
|
- mode: {{ salt['pillar.get']('bind:config:mode', '644') }}
|
||||||
- require:
|
- require:
|
||||||
- pkg: bind
|
- pkg: bind
|
||||||
|
@ -78,8 +78,8 @@ bind_options_config:
|
||||||
- name: {{ map.options_config }}
|
- name: {{ map.options_config }}
|
||||||
- source: 'salt://bind/files/debian/named.conf.options'
|
- source: 'salt://bind/files/debian/named.conf.options'
|
||||||
- template: jinja
|
- template: jinja
|
||||||
- user: {{ salt['pillar.get']('bind:config:user', 'map.user') }}
|
- user: {{ salt['pillar.get']('bind:config:user', map.user) }}
|
||||||
- group: {{ salt['pillar.get']('bind:config:group', 'map.group') }}
|
- group: {{ salt['pillar.get']('bind:config:group', map.group) }}
|
||||||
- mode: {{ salt['pillar.get']('bind:config:mode', '644') }}
|
- mode: {{ salt['pillar.get']('bind:config:mode', '644') }}
|
||||||
- require:
|
- require:
|
||||||
- pkg: bind
|
- pkg: bind
|
||||||
|
@ -92,8 +92,8 @@ bind_default_zones:
|
||||||
- name: {{ map.default_zones_config }}
|
- name: {{ map.default_zones_config }}
|
||||||
- source: 'salt://bind/files/debian/named.conf.default-zones'
|
- source: 'salt://bind/files/debian/named.conf.default-zones'
|
||||||
- template: jinja
|
- template: jinja
|
||||||
- user: {{ salt['pillar.get']('bind:config:user', 'map.user') }}
|
- user: {{ salt['pillar.get']('bind:config:user', map.user) }}
|
||||||
- group: {{ salt['pillar.get']('bind:config:group', 'map.group') }}
|
- group: {{ salt['pillar.get']('bind:config:group', map.group) }}
|
||||||
- mode: {{ salt['pillar.get']('bind:config:mode', '644') }}
|
- mode: {{ salt['pillar.get']('bind:config:mode', '644') }}
|
||||||
- require:
|
- require:
|
||||||
- pkg: bind
|
- pkg: bind
|
||||||
|
@ -116,8 +116,8 @@ zones-{{ file }}:
|
||||||
- managed
|
- managed
|
||||||
- name: {{ map.named_directory }}/{{ file }}
|
- name: {{ map.named_directory }}/{{ file }}
|
||||||
- source: 'salt://bind/zones/{{ file }}'
|
- source: 'salt://bind/zones/{{ file }}'
|
||||||
- user: {{ salt['pillar.get']('bind:config:user', 'map.user') }}
|
- user: {{ salt['pillar.get']('bind:config:user', map.user) }}
|
||||||
- group: {{ salt['pillar.get']('bind:config:group', 'map.group') }}
|
- group: {{ salt['pillar.get']('bind:config:group', map.group) }}
|
||||||
- mode: {{ salt['pillar.get']('bind:config:mode', '644') }}
|
- mode: {{ salt['pillar.get']('bind:config:mode', '644') }}
|
||||||
- watch_in:
|
- watch_in:
|
||||||
- service: bind
|
- service: bind
|
||||||
|
|
Loading…
Add table
Reference in a new issue