Merge pull request #94 from netmanagers/refactor-named.conf.local_and_logging

Refactor named.conf.local & logging

Author: aanriot

bind/config.sls

@@ -59,7 +59,7 @@ bind_config:
 bind_local_config:
   file.managed:
     - name: {{ map.local_config }}
-    - source: 'salt://{{ map.config_source_dir }}/named.conf.local'
+    - source: salt://bind/files/named.conf.local.jinja
     - template: jinja
     - user: {{ salt['pillar.get']('bind:config:user', map.user) }}
     - group: {{ salt['pillar.get']('bind:config:group', map.group) }}
@@ -140,7 +140,7 @@ bind_default_zones:
 bind_logging_config:
   file.managed:
     - name: {{ map.logging_config }}
-    - source: salt://{{ map.config_source_dir }}/named.conf.logging
+    - source: salt://bind/files/named.conf.logging.jinja
     - template: jinja
     - user: {{ salt['pillar.get']('bind:config:user', map.user) }}
     - group: {{ salt['pillar.get']('bind:config:group', map.group) }}

bind/files/arch/named.conf

@@ -64,16 +64,4 @@ zone "." IN {
 //    allow-transfer { any; };
 //};
 
-//logging {
-//    channel xfer-log {
-//        file "/var/log/named.log";
-//            print-category yes;
-//            print-severity yes;
-//            severity info;
-//        };
-//        category xfer-in { xfer-log; };
-//        category xfer-out { xfer-log; };
-//        category notify { xfer-log; };
-//};
-
 include "{{ map.local_config }}";

bind/files/arch/named.conf.local

@@ -109,6 +109,7 @@ match-clients {
 };
 {%- endfor %}
 
+{%- if salt['pillar.get']('bind:config:enable_logging', True) %}
 {%- if salt['pillar.get']('bind:config:use_extensive_logging', False) %}
 include "{{ map.logging_config }}";
 {% else %}
@@ -120,6 +121,7 @@ logging {
   category queries { querylog; };
 };
 {%- endif %}
+{%- endif %}
 
 {%- if salt['pillar.get']('bind:controls', False) %}
 controls {

bind/files/freebsd/named.conf.local

@@ -32,46 +32,6 @@ options {
         managed-keys-directory "/var/named/dynamic";
 };
 
-logging {
-        channel default_debug {
-                file "data/named.run";
-                severity dynamic;
-        };
-
-{%- for channel, value in salt['pillar.get']('bind:config:logging:channels', {}).items() -%}
-        {%- if value is iterable %}
-        channel {{ channel }} {
-        {%- for statement, item in value.items() %}
-                {{ statement }} {{ item }};
-        {%- endfor %}
-        };
-        {%- endif %}
-{%- endfor %}
-
-{%- for statement, value in salt['pillar.get']('bind:config:logging:category', {}).items() %}
-        category {{ statement }} {
-        {%- for item in value %}
-                {{ item }};
-        {%- endfor %}
-        };
-{%- endfor %}
-
-{%- for statement, value in salt['pillar.get']('bind:config:logging', {}).items() -%}
-    {%- if statement not in ( 'channels', 'category' ) %}
-    {%- if value is iterable and value is not string %}
-        {{ statement }} {
-        {%- for item in value %}
-                {{ item }};
-        {%- endfor %}
-        };
-    {%- else %}
-        {{ statement }} {{ value }};
-    {%- endif %}
-    {%- endif %}
-{%- endfor %}
-
-};
-
 zone "." IN {
         type hint;
         file "named.ca";

bind/files/debian/named.conf.local bind/files/named.conf.local.jinjabind/files/debian/named.conf.local renamed to bind/files/named.conf.local.jinja

@@ -108,37 +108,6 @@ options {
 
 };
 
-# To configure named's logging remove the leading '#' characters of the
-# following examples.
-#logging {
-#	# Log queries to a file limited to a size of 100 MB.
-#	channel query_logging {
-#		file "/var/log/named_querylog"
-#			versions 3 size 100M;
-#		print-time yes;			// timestamp log entries
-#	};
-#	category queries {
-#		query_logging;
-#	};
-#
-#	# Or log this kind alternatively to syslog.
-#	channel syslog_queries {
-#		syslog user;
-#		severity info;
-#	};
-#	category queries { syslog_queries; };
-#
-#	# Log general name server errors to syslog.
-#	channel syslog_errors {
-#		syslog user;
-#		severity error;
-#	};
-#	category default { syslog_errors;  };
-#
-#	# Don't log lame server messages.
-#	category lame-servers { null; };
-#};
-
 # The following zone definitions don't need any modification.  The first one
 # is the definition of the root name servers.  The second one defines
 # localhost while the third defines the reverse lookup for localhost.