Converted bind

bind/Dockerfile

@@ -1,29 +1,17 @@
-FROM robinthoni/debian-multiarch:jessie
+FROM debian:stretch
 
-MAINTAINER Robin Thoni <robin@rthoni.com>
+ADD https://raw.githubusercontent.com/robin-thoni/docker-utils/v1.1.0/setup.sh /tmp/docker-utils-setup.sh
+RUN sh /tmp/docker-utils-setup.sh
+ENTRYPOINT ["gcf-entrypoint"]
 
-ARG CONFIG_DIR=/etc/default/config-files/
-
-RUN apt-get update && apt-get -y install\
+RUN pkgs-install\
         bind9\
         dnsutils\
-        bind9utils &&\
-        apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-RUN rm -rf /var/log/*
-
-COPY ./vars-vars /etc/vars-vars
-
-COPY ./vars-files /etc/vars-files
-
-COPY ./common.sh /common.sh
-
-COPY ./run.sh /run.sh
-
-RUN mkdir "${CONFIG_DIR}"
+        bind9utils
 
-COPY ./config "${CONFIG_DIR}"
+COPY ./config /etc/salt/base/
 
 EXPOSE 53/udp 53/tcp
 
-CMD ["/run.sh"]
+#CMD ["named-checkconf", "-z"]
+CMD ["named", "-f", "-d", "10", "-4"]

bind/common.sh

@@ -1,41 +0,0 @@
-export CONFIG_DIR="/etc/default/config-files/"
-
-resolv_host()
-{
-  hostname="${1}"
-  ip=$(getent hosts "${hostname}" | cut -d' ' -f1)
-  echo "${ip}"
-}
-
-replace_var()
-{
-  file="${1}"
-  var="${2}"
-  sed -e "s?${var}?${!var}?g" -i "${file}"
-}
-
-replace_vars()
-{
-  file="${1}"
-  for var in $(cat /etc/vars-vars)
-  do
-    replace_var "${file}" "${var}"
-  done
-}
-
-replace_files()
-{
-  cat /etc/vars-files | while read line
-  do
-    filesrc="${CONFIG_DIR}$(echo "${line}" | awk '{print $1}')"
-    filedst=$(echo "${line}" | awk '{print $2}')
-    if [ -f "${filesrc}" ]
-    then
-      echo "Expanding file ${filesrc} to ${filedst}"
-      cp "${filesrc}" "${filedst}"
-      replace_vars "${filedst}"
-    else
-      echo "File ${filesrc} does not exist. Skipping."
-    fi
-  done
-}

bind/config/states/bind/init.sls

@@ -0,0 +1,7 @@
+{% for filename in ["named.conf", "named.conf.local", "rndc.conf"] %}
+bind9-config-{{ filename }}:
+  file.managed:
+    - name: /etc/bind/{{ filename }}
+    - source: salt://bind/{{ filename }}
+    - template: jinja
+{% endfor %}

bind/config/named.conf → bind/config/states/bind/named.conf

@@ -6,17 +6,17 @@ logging {
 
 key "key-internal" {
     algorithm HMAC-MD5;
-    secret "DNS_TSIG_KEY_INTERNAL_SECRET";
+    secret "{{ salt['pillar.get']("model:dns:tsig:keys:internal") }}";
 };
 
 key "key-external" {
     algorithm HMAC-MD5;
-    secret "DNS_TSIG_KEY_EXTERNAL_SECRET";
+    secret "{{ salt['pillar.get']("model:dns:tsig:keys:external") }}";
 };
 
 key "key-rndc" {
     algorithm HMAC-MD5;
-    secret "DNS_TSIG_KEY_RNDC_SECRET";
+    secret "{{ salt['pillar.get']("model:dns:tsig:keys:rndc") }}";
 };
 
 acl "acl-internal" {

bind/config/named.conf.local → bind/config/states/bind/named.conf.local

@@ -17,9 +17,15 @@ view "view-internal" {
   allow-notify {
     key "key-internal";
   };
+  {% if (salt['pillar.get']("model:dns:forwarders", []) | length) > 0 %}
+  forwarders {
+  {% for forwarder in salt['pillar.get']("model:dns:forwarders") %}
+    {{ forwarder }};
+  {% endfor %}
+  };
+  {% endif %}
 
   include "/etc/bind/named.conf.default-zones";
-  include "/etc/bind/zones.rfc1918";
   include "/etc/bind/config/named.conf.local.internal";
 };
 

bind/run.sh

@@ -1,8 +0,0 @@
-#! /usr/bin/env bash
-
-. /common.sh
-
-replace_files
-
-exec named -f -d 10 -4
-#exec cat /etc/bind/named.conf; named-checkconf -z; named -f -d 10 -4

bind/vars-files

@@ -1,3 +0,0 @@
-named.conf /etc/bind/named.conf
-named.conf.local /etc/bind/named.conf.local
-rndc.conf /etc/bind/rndc.conf

bind/vars-vars

@@ -1,22 +0,0 @@
-DHCP_DNS_MASTER
-DHCP_DNS_SERVERS
-DHCP_TFTP_SERVER
-DHCP_ROUTERS
-DHCP_UNIFI_CONTROLLER_IP
-
-DHCP_DOMAIN
-DHCP_SITE_DOMAIN
-DHCP_DYN_IPS_DOMAIN
-DHCP_REV_DOMAIN
-
-DHCP_SUBNET
-DHCP_NETMASK
-DHCP_IP_FIRST
-DHCP_IP_LAST
-DHCP_BROADCAST
-
-DNS_FORWARDER_IP_1
-DNS_FORWARDER_IP_2
-DNS_TSIG_KEY_INTERNAL_SECRET
-DNS_TSIG_KEY_EXTERNAL_SECRET
-DNS_TSIG_KEY_RNDC_SECRET