Compare commits

..

3 Commits

Author SHA1 Message Date
5023b5e0a3
fix(checkconf): only check main config
Included configurations in nsd.conf.d tend to depend on each other. For
example when referring a TSIG key from 80-generates-keys in
90-generated-zones, running nsd-checkconf on these individual files
would cause an error.
It is sufficient and better to just check the main nsd.conf file, as it
combines all included configurations in the check.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-02-18 16:12:58 +01:00
9bbffa5f1f
feat(keys): allow pillar based management
Introduce managed TSIG keys configuration using pillar data.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-02-18 16:09:24 +01:00
307ed12b2b
feat(zones): allow custom options and files
- allow additional configuration options in zone blocks
- allow installation of zone files from other Salt file roots

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-02-18 16:06:35 +01:00
2 changed files with 1 additions and 2 deletions

View File

@ -11,7 +11,7 @@ zone:
zonefile: "{{ nsd.zones_dir }}/{{ zonefile_name(name, config) }}"
{%- for option in extraopts %}
{%- if option in config %}
{{ option }}: "{{ config[option] }}"
{{ option }}: {{ config[option] }}
{%- endif %}
{%- endfor %}
{%- endfor %}

View File

@ -25,7 +25,6 @@
- file: nsd-config-file-file-managed
- context:
nsd: {{ nsd | json }}
- check_cmd: nsd-checkconf
- watch_in:
- service: nsd-service-running-service-running
{%- endmacro %}