Merge and move branch 'master' of github.com:desec/desec-ns

api/entrypoint.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 host=db; port=3306; n=120; i=0; while ! (echo > /dev/tcp/$host/$port) 2> /dev/null; do [[ $i -eq $n ]] && >&2 echo "$host:$port not up after $n seconds, exiting" && exit 1; echo "waiting for $host:$port to come up"; sleep 1; i=$((i+1)); done
-host=ns; port=8081; n=120; i=0; while ! (echo > /dev/tcp/$host/$port) 2> /dev/null; do [[ $i -eq $n ]] && >&2 echo "$host:$port not up after $n seconds, exiting" && exit 1; echo "waiting for $host:$port to come up"; sleep 1; i=$((i+1)); done
+host=nslord; port=8081; n=120; i=0; while ! (echo > /dev/tcp/$host/$port) 2> /dev/null; do [[ $i -eq $n ]] && >&2 echo "$host:$port not up after $n seconds, exiting" && exit 1; echo "waiting for $host:$port to come up"; sleep 1; i=$((i+1)); done
 
 python manage.py migrate
 

desec-ns

@@ -1 +0,0 @@
-../desec-ns

docker-compose.dev.yml

@@ -1,4 +1,4 @@
-ns:
+nslord:
   # extending from main .yml
   ports:
     - "5300:53"

docker-compose.tests.api.yml

@@ -1,3 +1,3 @@
-ns-tests-api:
-  build: desec-ns
+nslord-tests-api:
+  build: nslord
   dockerfile: Dockerfile.regression-tests.api

docker-compose.tests.yml

@@ -1,5 +1,5 @@
-ns-tests:
-  build: desec-ns
+nslord-tests:
+  build: nslord
   dockerfile: Dockerfile.regression-tests
   links:
    - db

docker-compose.yml

@@ -22,11 +22,11 @@ api:
   build: api
   links:
    - db
-   - ns
+   - nslord
   volumes:
    - ./api-settings.py:/usr/src/app/desecapi/settings_local.py
 
-ns:
-  build: desec-ns
+nslord:
+  build: nslord
   links:
    - db

nslord/Dockerfile

@@ -0,0 +1,23 @@
+FROM debian:jessie
+
+RUN echo 'deb http://repo.powerdns.com/debian jessie-auth-40 main' \
+      >> /etc/apt/sources.list \
+ && echo 'Package: pdns-*' \
+      > /etc/apt/preferences.d/pdns \
+ && echo 'Pin: origin repo.powerdns.com' \
+      >> /etc/apt/preferences.d/pdns \
+ && echo 'Pin-Priority: 600' \
+      >> /etc/apt/preferences.d/pdns
+
+RUN set -ex \
+	&& apt-key adv --keyserver hkp://pool.sks-keyservers.net --recv 0x1B0C6205FD380FBB \
+	&& apt-get update \
+	&& apt-get install -y pdns-server pdns-backend-mysql \
+	&& apt-get clean \
+	&& rm -rf /var/lib/apt/lists/*
+
+COPY ./pdns-mysql.conf /etc/powerdns/pdns.d/pdns.local.gmysql.conf
+COPY ./pdns.conf /etc/powerdns/pdns.conf
+COPY ./entrypoint.sh /root/
+
+CMD ["/root/entrypoint.sh"]

nslord/entrypoint.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+host=db; port=3306; n=120; i=0; while ! (echo > /dev/tcp/$host/$port) 2> /dev/null; do [[ $i -eq $n ]] && >&2 echo "$host:$port not up after $n seconds, exiting" && exit 1; echo "waiting for $host:$port to come up"; sleep 1; i=$((i+1)); done
+
+pdns_server --daemon=no

nslord/pdns-mysql.conf

@@ -0,0 +1,9 @@
+launch+=gmysql
+
+gmysql-host=db
+gmysql-port=
+gmysql-dbname=pdns
+gmysql-user=pdns
+gmysql-password=123test
+gmysql-dnssec=yes
+

nslord/pdns.conf

@@ -0,0 +1,30 @@
+log-dns-queries=yes
+loglevel=5
+allow-axfr-ips=178.63.189.72/32,54.88.76.245/32,2a01:4f8:101:31e2:a5a2:4:0:2,127.0.0.0/8,::1
+allow-recursion=127.0.0.1
+config-dir=/etc/powerdns
+daemon=yes
+default-soa-mail=hostmaster.nils.dedyn.io
+default-soa-name=ns1.nils.dedyn.io
+default-soa-edit=INCREMENT-WEEKS
+default-ttl=60
+disable-axfr=no
+api=yes
+api-key=123password
+api-logfile=/var/log/pdns-api.log
+webserver=yes
+webserver-address=0.0.0.0
+webserver-allow-from=0.0.0.0/0;::/0
+guardian=yes
+include-dir=/etc/powerdns/pdns.d
+launch=
+local-address=0.0.0.0
+local-ipv6=::
+master=yes
+setgid=pdns
+setuid=pdns
+soa-expire-default=1209600
+soa-minimum-ttl=60
+soa-refresh-default=60
+soa-retry-default=60
+