Repository: stratos Updated Branches: refs/heads/master 8006ca82d -> a37337d05
remove reverse address lookup configuration from bind docker image Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a37337d0 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a37337d0 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a37337d0 Branch: refs/heads/master Commit: a37337d051f3911c9ddd0b6eae313dd330da86cd Parents: 8006ca8 Author: Chris Snow <[email protected]> Authored: Mon Aug 25 18:33:50 2014 +0000 Committer: Chris Snow <[email protected]> Committed: Mon Aug 25 18:34:30 2014 +0000 ---------------------------------------------------------------------- tools/stratos-docker-images/bind/Dockerfile | 3 --- .../stratos-docker-images/bind/inaddr_template | 13 ---------- tools/stratos-docker-images/bind/run | 25 +------------------- tools/stratos-docker-images/bind/run-example.sh | 2 +- 4 files changed, 2 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/a37337d0/tools/stratos-docker-images/bind/Dockerfile ---------------------------------------------------------------------- diff --git a/tools/stratos-docker-images/bind/Dockerfile b/tools/stratos-docker-images/bind/Dockerfile index eb25bd4..1e7151e 100755 --- a/tools/stratos-docker-images/bind/Dockerfile +++ b/tools/stratos-docker-images/bind/Dockerfile @@ -26,9 +26,6 @@ RUN apt-get install -y bind9 COPY zone_template /etc/bind/zone_template -# disable reverse address lookups - this may not be possible without ISP delegating the reverse done -#COPY inaddr_template /etc/bind/inaddr_template - EXPOSE 53/udp ADD run /usr/local/bin/run http://git-wip-us.apache.org/repos/asf/stratos/blob/a37337d0/tools/stratos-docker-images/bind/inaddr_template ---------------------------------------------------------------------- diff --git a/tools/stratos-docker-images/bind/inaddr_template b/tools/stratos-docker-images/bind/inaddr_template deleted file mode 100644 index 7f30a53..0000000 --- a/tools/stratos-docker-images/bind/inaddr_template +++ /dev/null @@ -1,13 +0,0 @@ -$TTL 10 ; -; $TTL used for all RRs without explicit TTL value -$ORIGIN @[email protected]. -@ 1D IN SOA ns.@DOMAIN@. hostmaster.@DOMAIN@. ( - 2002022401 ; serial - 10 ; refresh - 15 ; retry - 10 ; expire - 10 ; minimum - ) - -@[email protected]. IN NS ns.@DOMAIN@. - http://git-wip-us.apache.org/repos/asf/stratos/blob/a37337d0/tools/stratos-docker-images/bind/run ---------------------------------------------------------------------- diff --git a/tools/stratos-docker-images/bind/run b/tools/stratos-docker-images/bind/run index 757b2d1..de17354 100755 --- a/tools/stratos-docker-images/bind/run +++ b/tools/stratos-docker-images/bind/run @@ -27,33 +27,19 @@ UPDATE_ADDR_LIST=${UPDATE_ADDR_LIST:-none} export REV_IP_ADDR=$(echo $IP_ADDR | awk -F . '{print $4 "." $3 "." $2 "." $1}') -# disable reverse address lookups - this may not be possible without ISP delegating the reverse done -#export REV_SUBNET_ADDR=$(echo $SUBNET_ADDR | awk -F . '{print $4 "." $3 "." $2 "." $1}' | sed 's/^\.*//g') - echo ============================= echo Environment Variable Settings echo ============================= echo Setting DOMAIN=$DOMAIN echo Setting IP_ADDR=$IP_ADDR -#echo Setting REV_IP_ADDR=$REV_IP_ADDR -#echo Setting SUBNET_ADDR=$SUBNET_ADDR -#echo Setting REV_SUBNET_ADDR=$REV_SUBNET_ADDR echo Setting UPDATE_ADDR_LIST=$UPDATE_ADDR_LIST echo ========================= cp /etc/bind/zone_template /var/cache/bind/db.$DOMAIN -# disable reverse address lookup -#cp /etc/bind/inaddr_template /var/cache/bind/db.$SUBNET_ADDR - sed -i "s/@DOMAIN@/$DOMAIN/g" /var/cache/bind/db.$DOMAIN sed -i "s/@IP_ADDR@/$IP_ADDR/g" /var/cache/bind/db.$DOMAIN -# disable reverse address lookup -#sed -i "s/@REV_IP_ADDR@/$REV_IP_ADDR/g" /var/cache/bind/db.$SUBNET_ADDR -#sed -i "s/@REV_SUBNET_ADDR@/$REV_SUBNET_ADDR/g" /var/cache/bind/db.$SUBNET_ADDR -#sed -i "s/@DOMAIN@/$DOMAIN/g" /var/cache/bind/db.$SUBNET_ADDR - cat > /etc/bind/named.conf.local <<EOF zone "$DOMAIN" in { type master; @@ -62,16 +48,7 @@ zone "$DOMAIN" in { }; EOF -# disable reverse address lookup -#cat >> /etc/bind/named.conf.local <<EOF -#zone "$REV_SUBNET_ADDR.in-addr.arpa" in { -# type master; -# notify no; -# file "db.$SUBNET_ADDR"; -#}; -#EOF - -# server will not start with IPV6 enabled +# TODO: will server start with IPV6 enabled? #sed -i 's/OPTIONS="-u bind"/OPTIONS="-u bind -4"/g' /etc/default/bind9 exec /usr/sbin/named -u bind -g http://git-wip-us.apache.org/repos/asf/stratos/blob/a37337d0/tools/stratos-docker-images/bind/run-example.sh ---------------------------------------------------------------------- diff --git a/tools/stratos-docker-images/bind/run-example.sh b/tools/stratos-docker-images/bind/run-example.sh index 85d618f..3314e93 100755 --- a/tools/stratos-docker-images/bind/run-example.sh +++ b/tools/stratos-docker-images/bind/run-example.sh @@ -26,7 +26,7 @@ DOMAIN=example.com # IP_ADDR is the IP address of the host running the DNS docker image IP_ADDR=192.168.56.5 -# UPDATE_ADDR_LIST is the list of addresses that can dynamically update the DNS server (see http://www.zytrax.com/books/dns/ch7/address_match_list.html) +# UPDATE_ADDR_LIST list of addresses that can dynamically update the DNS server # see http://www.zytrax.com/books/dns/ch7/address_match_list.html UPDATE_ADDR_LIST=any
