saltstack-formulas/bind-formula
1
0
Fork 0
mirror of https://github.com/saltstack-formulas/bind-formula.git synced 2025-04-17 02:00:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #87 from bmwiedemann/master

Browse source 
1 fix for SUSE and 2 commits to nicify
This commit is contained in:
Javier Bértoli 2018-03-26 10:03:43 -03:00 • committed by GitHub
commit 3cbc53e207
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bind/config.sls
View file

@ -24,7 +24,6 @@ bind_restart:
- 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:log_mode', map.log_mode) }} - mode: {{ salt['pillar.get']('bind:config:log_mode', map.log_mode) }}
- replace: False
- require: - require:
- file: {{ map.log_dir }} - file: {{ map.log_dir }}
@ -82,6 +81,8 @@ bind_default_config:
- user: root - user: root
- group: root - group: root
- mode: 644 - mode: 644
- context:
map: {{ map }}
- watch_in: - watch_in:
- service: bind_restart - service: bind_restart
{% endif %} {% endif %}

3
bind/files/suse/default
View file

@ -1,3 +1,5 @@
# This file is managed by salt - DO NOT EDIT!
{% set protocol = salt['pillar.get']('bind:config:protocol', False) -%} {% set protocol = salt['pillar.get']('bind:config:protocol', False) -%}
{% set param = [] -%} {% set param = [] -%}
{% if protocol -%} {% if protocol -%}
@ -5,7 +7,6 @@
{% endif -%} {% endif -%}
## Path: Network/DNS/Name Server ## Path: Network/DNS/Name Server
## Description: Names server settings ## Description: Names server settings
## Type: yesno ## Type: yesno
## Default: yes ## Default: yes
## ServiceRestart: lwresd,named ## ServiceRestart: lwresd,named