updated confs, env, run.sh

env

@@ -6,8 +6,8 @@ POSTGRES_DB=poweradmin
 PDNS_RECURSOR_HOST=pdns-recursor.pdns.internal.docker
 PDNS_API_KEY=change_it
 PDNS_WEBSERVER_PASSWORD=change_it
-PDNS_ALLOW_AXFR_IPS=127.0.0.1,172.0.0.0/8,192.168.0.0/16
-PDNS_ALLOW_RECURSION=127.0.0.1,172.0.0.0/8,192.168.0.0/16
+PDNS_ALLOW_AXFR_IPS=127.0.0.1/8,172.16.0.0/12,192.168.0.0/16,10.0.0.0/8
+PDNS_ALLOW_RECURSION=127.0.0.1/8,172.16.0.0/12,192.168.0.0/16,10.0.0.0/8
 PDNS_ALSO_NOTIFY=
 PDNS_ALLOW_NOTIFY_FROM=0.0.0.0/0,::/0
 PDNS_ALLOW_DNSUPDATE_FROM=127.0.0.0/8,::1

pdns-recursor/Dockerfile

@@ -2,6 +2,17 @@ FROM robinthoni/debian-multiarch:jessie
 
 MAINTAINER Robin Thoni <robin@rthoni.com>
 
+ARG CONFIG_DIR=/etc/default/config-files/
+
+RUN apt-get update && \
+    apt-get install -y curl && \
+    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN dist=$(if uname -m | grep -iq arm  ; then echo raspbian; else echo debian; fi) &&\
+     echo "deb http://repo.powerdns.com/${dist} jessie-rec-40 main" > /etc/apt/sources.list.d/pdns.list && \
+    echo 'Package: pdns-*\nPin: origin repo.powerdns.com\nPin-Priority: 600' > /etc/apt/preferences.d/pdns && \
+    curl https://repo.powerdns.com/FD380FBB-pub.asc | apt-key add -
+
 RUN DEBIAN_FRONTEND=noninteractive apt-get update &&\
     apt-get install -y pdns-recursor &&\
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
@@ -10,10 +21,18 @@ RUN rm -rf /etc/powerdns/*
 
 RUN rm -rf /var/log/*
 
-COPY ./config/ /etc/powerdns/
+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}"
+
+COPY ./config/recursor.conf "${CONFIG_DIR}"/recursor.conf
+
 EXPOSE 53/udp
 
 CMD ["/run.sh"]

pdns-recursor/common.sh

@@ -0,0 +1,41 @@
+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
+}

pdns-recursor/run.sh

@@ -1,3 +1,7 @@
 #! /usr/bin/env bash
 
+. /common.sh
+
+replace_files
+
 pdns_recursor --daemon=no

pdns-recursor/vars-files

@@ -0,0 +1 @@
+recursor.conf /etc/powerdns/recursor.conf

pdns-recursor/vars-vars

@@ -0,0 +1,20 @@
+POSTGRES_HOST
+POSTGRES_USER
+POSTGRES_PASSWORD
+POSTGRES_DB
+
+PDNS_RECURSOR_HOST
+PDNS_API_KEY
+PDNS_WEBSERVER_PASSWORD
+PDNS_ALLOW_AXFR_IPS
+PDNS_ALLOW_RECURSION
+PDNS_ALSO_NOTIFY
+PDNS_ALLOW_NOTIFY_FROM
+PDNS_ALLOW_DNSUPDATE_FROM
+
+SESSION_KEY
+
+DNS_HOSTMASTER
+DNS_NS1
+DNS_NS2
+DNS_TTL

pdns/Dockerfile

@@ -2,6 +2,8 @@ FROM robinthoni/debian-multiarch:jessie
 
 MAINTAINER Robin Thoni <robin@rthoni.com>
 
+ARG CONFIG_DIR=/etc/default/config-files/
+
 RUN apt-get update && \
     apt-get install -y curl && \
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
@@ -19,18 +21,20 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update &&\
     apt-get install -y pdns-server pdns-backend-pgsql &&\
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-RUN rm -rf /etc/powerdns/*
-
 RUN rm -rf /var/log/*
 
-COPY ./config/ /etc/powerdns/
-
 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}"
+
+COPY ./config/pdns.conf "${CONFIG_DIR}"/pdns.conf
+
 EXPOSE 53/udp
 
 CMD ["/run.sh"]

pdns/common.sh

@@ -0,0 +1,41 @@
+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
+}

pdns/config/pdns.conf

@@ -238,13 +238,12 @@ guardian=yes
 # include-dir Include *.conf files from this directory
 #
 # include-dir=
-include-dir=/etc/powerdns/pdns.d
+# include-dir=/etc/powerdns/pdns.d
 
 #################################
 # launch  Which backends to launch and order to query them in
 #
 # launch=
-launch=
 
 #################################
 # load-modules  Load this module - supply absolute or relative path
@@ -575,3 +574,17 @@ webserver-print-arguments=yes
 # xfr-max-received-mbytes Maximum number of megabytes received from an incoming XFR
 #
 # xfr-max-received-mbytes=100
+
+
+# PostgreSQL Configuration
+#
+# Launch gpgsql backend
+launch=gpgsql
+
+# gpgsql parameters
+gpgsql-host=POSTGRES_HOST
+gpgsql-port=
+gpgsql-dbname=POSTGRES_DB
+gpgsql-user=POSTGRES_USER
+gpgsql-password=POSTGRES_PASSWORD
+gpgsql-dnssec=yes

pdns/config/pdns.d/pdns.local.gpgsql.conf

@@ -1,12 +0,0 @@
-# PostgreSQL Configuration
-#
-# Launch gpgsql backend
-launch+=gpgsql
-
-# gpgsql parameters
-gpgsql-host=POSTGRES_HOST
-gpgsql-port=
-gpgsql-dbname=POSTGRES_DB
-gpgsql-user=POSTGRES_USER
-gpgsql-password=POSTGRES_PASSWORD
-gpgsql-dnssec=yes

pdns/run.sh

@@ -4,29 +4,7 @@ sleep 5
 
 export PDNS_RECURSOR_HOST="$(getent hosts ${PDNS_RECURSOR_HOST} | cut -d' ' -f1)"
 
-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()
-{
-  for file in $(cat /etc/vars-files)
-  do
-    replace_vars "${file}"
-  done
-}
+. /common.sh
 
 replace_files
 

pdns/vars-files

@@ -1,2 +1 @@
-/etc/powerdns/pdns.d/pdns.local.gpgsql.conf
-/etc/powerdns/pdns.conf
+pdns.conf /etc/powerdns/pdns.conf

poweradmin/apache2.conf

@@ -1,5 +1,6 @@
 # see http://sources.debian.net/src/apache2/2.4.10-1/debian/config-dir/apache2.conf
 
+ServerName poweradmin
 Mutex file:/var/lock/apache2 default
 PidFile /var/run/apache2/apache2.pid
 Timeout 300

update_vars.sh

@@ -1,7 +1,7 @@
 #! /usr/bin/env sh
 
 vars=$(cat env | cut -d= -f1)
-for docker in pdns poweradmin
+for docker in pdns pdns-recursor poweradmin
 do
   echo "${vars}" > "./${docker}/vars-vars"
 done