Merge pull request #26 from hvnsweeting/master

refactor
This commit is contained in:
Nitin Madhok 2015-03-25 20:08:16 -04:00
commit 184cfca2d0

View file

@ -6,8 +6,10 @@ include:
{{ map.log_dir }}: {{ map.log_dir }}:
file.directory: file.directory:
- user: root - user: root
- group: bind - group: {{ salt['pillar.get']('bind:config:group', map.group) }}
- mode: 775 - mode: 775
- require:
- pkg: bind
bind_restart: bind_restart:
service.running: service.running:
@ -15,13 +17,11 @@ bind_restart:
- reload: False - reload: False
- watch: - watch:
- file: {{ map.log_dir }}/query.log - file: {{ map.log_dir }}/query.log
- require:
- file: {{ map.log_dir }}/query.log
{{ map.log_dir }}/query.log: {{ map.log_dir }}/query.log:
file.managed: file.managed:
- user: bind - user: bind
- group: bind - group: {{ salt['pillar.get']('bind:config:group', map.group) }}
- mode: 644 - mode: 644
- require: - require:
- file: {{ map.log_dir }} - file: {{ map.log_dir }}
@ -113,7 +113,6 @@ bind_default_zones:
- template: jinja - template: jinja
- user: root - user: root
- group: root - group: root
- template: jinja
- context: - context:
map: {{ map }} map: {{ map }}
{% endif %} {% endif %}
@ -131,7 +130,7 @@ zones-{{ file }}:
- watch_in: - watch_in:
- service: bind - service: bind
- require: - require:
- file: {{ map.named_directory }} - file: named_directory
{% if args['dnssec'] is defined and args['dnssec'] -%} {% if args['dnssec'] is defined and args['dnssec'] -%}
signed-{{ file }}: signed-{{ file }}:
@ -159,7 +158,7 @@ zones-{{ file }}:
- watch_in: - watch_in:
- service: bind - service: bind
- require: - require:
- file: {{ map.named_directory }} - file: named_directory
{% if args['dnssec'] is defined and args['dnssec'] -%} {% if args['dnssec'] is defined and args['dnssec'] -%}
signed-{{ file }}: signed-{{ file }}: