Generate pdns.conf-dist after building pdns_server

diff --git a/build-scripts/test-auth b/build-scripts/test-auth
index 3f5b585814ef9d75befab11c7674faf57c00feca..db14644717eaabb1f8fe201834d5c5c2e5af3c28 100755 (executable)
--- a/build-scripts/test-auth
+++ b/build-scripts/test-auth
@@ -109,9 +109,6 @@ if [ -z "$context" ]; then
 
        cd ../regression-tests.nobackend/
 
-       # The package builds define other dirs, so the distconf test fails, so skip it
-       touch pdnsconfdist/skip
-
        ./runtests || EXITCODE=1
 elif [ "$context" = "odbc" ]; then
        cat > ~/.odbc.ini << __EOF__

diff --git a/pdns/.gitignore b/pdns/.gitignore
index f3b291434675f4614ab39a2900a95dcb9f833b8b..c11064050ba79f3966d4d974d1c3e97c2da52cf9 100644 (file)
--- a/pdns/.gitignore
+++ b/pdns/.gitignore
@@ -58,3 +58,4 @@ effective_tld_names.dat
 /dnsmessage.pb.cc
 /dnsmessage.pb.h
 /pdns.service
+/pdns.conf-dist

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index f06feb34d8085c98a6943fcfcda6f25dba3deb9a..c71cb4c40bfe97d32b1fddd4ec6b46f9606a5442 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -49,7 +49,6 @@ EXTRA_DIST = \
        bind-dnssec.schema.sqlite3.sql \
        bindparser.h \
        named.conf.parsertest \
-       pdns.conf-dist \
        delaypipe.hh delaypipe.cc \
        pdns.service.in
 
@@ -64,7 +63,8 @@ CLEANFILES = \
        backends/gsql/gsqlbackend.gcda \
        backends/gsql/gsqlbackend.gcno \
        backends/gsql/gsqlbackend.gcov \
-       dnsmessage.pb.cc dnsmessage.pb.h
+       dnsmessage.pb.cc dnsmessage.pb.h \
+       pdns.conf-dist
 
 noinst_SCRIPTS = pdns.init
 sysconf_DATA = pdns.conf-dist
@@ -1057,6 +1057,9 @@ dnspcap2protobuf_LDADD = \
 endif
 endif
 
+pdns.conf-dist: pdns_server
+       $(AM_V_GEN)./pdns_server --no-config --config 2>/dev/null > $@
+
 testrunner_SOURCES = \
        arguments.cc \
        base32.cc \

diff --git a/pdns/pdns.conf-dist b/pdns/pdns.conf-dist
deleted file mode 100644 (file)
index 3973554..0000000
--- a/pdns/pdns.conf-dist
+++ /dev/null
@@ -1,567 +0,0 @@
-# Autogenerated configuration file template
-#################################
-# allow-axfr-ips       Allow zonetransfers only to these subnets
-#
-# allow-axfr-ips=127.0.0.0/8,::1
-
-#################################
-# allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges.
-#
-# allow-dnsupdate-from=127.0.0.0/8,::1
-
-#################################
-# allow-notify-from    Allow AXFR NOTIFY from these IP ranges. If empty, drop all incoming notifies.
-#
-# allow-notify-from=0.0.0.0/0,::/0
-
-#################################
-# allow-recursion      List of subnets that are allowed to recurse
-#
-# allow-recursion=0.0.0.0/0
-
-#################################
-# allow-unsigned-notify        Allow unsigned notifications for TSIG secured domains
-#
-# allow-unsigned-notify=yes
-
-#################################
-# allow-unsigned-supermaster   Allow supermasters to create zones without TSIG signed NOTIFY
-#
-# allow-unsigned-supermaster=yes
-
-#################################
-# also-notify  When notifying a domain, also notify these nameservers
-#
-# also-notify=
-
-#################################
-# any-to-tcp   Answer ANY queries with tc=1, shunting to TCP
-#
-# any-to-tcp=no
-
-#################################
-# api  Enable/disable the REST API
-#
-# api=no
-
-#################################
-# api-key      Static pre-shared authentication key for access to the REST API
-#
-# api-key=
-
-#################################
-# api-logfile  Location of the server logfile (used by the REST API)
-#
-# api-logfile=/var/log/pdns.log
-
-#################################
-# api-readonly Disallow data modification through the REST API when set
-#
-# api-readonly=no
-
-#################################
-# cache-ttl    Seconds to store packets in the PacketCache
-#
-# cache-ttl=20
-
-#################################
-# carbon-interval      Number of seconds between carbon (graphite) updates
-#
-# carbon-interval=30
-
-#################################
-# carbon-ourname       If set, overrides our reported hostname for carbon stats
-#
-# carbon-ourname=
-
-#################################
-# carbon-server        If set, send metrics in carbon (graphite) format to this server
-#
-# carbon-server=
-
-#################################
-# chroot       If set, chroot to this directory for more security
-#
-# chroot=
-
-#################################
-# config-dir   Location of configuration directory (pdns.conf)
-#
-# config-dir=/usr/local/etc
-
-#################################
-# config-name  Name of this virtual configuration - will rename the binary image
-#
-# config-name=
-
-#################################
-# control-console      Debugging switch - don't use
-#
-# control-console=no
-
-#################################
-# daemon       Operate as a daemon
-#
-# daemon=no
-
-#################################
-# default-ksk-algorithms       Default KSK algorithms
-#
-# default-ksk-algorithms=ecdsa256
-
-#################################
-# default-ksk-size     Default KSK size (0 means default)
-#
-# default-ksk-size=0
-
-#################################
-# default-soa-edit     Default SOA-EDIT value
-#
-# default-soa-edit=
-
-#################################
-# default-soa-edit-signed      Default SOA-EDIT value for signed zones
-#
-# default-soa-edit-signed=
-
-#################################
-# default-soa-mail     mail address to insert in the SOA record if none set in the backend
-#
-# default-soa-mail=
-
-#################################
-# default-soa-name     name to insert in the SOA record if none set in the backend
-#
-# default-soa-name=a.misconfigured.powerdns.server
-
-#################################
-# default-ttl  Seconds a result is valid if not set otherwise
-#
-# default-ttl=3600
-
-#################################
-# default-zsk-algorithms       Default ZSK algorithms
-#
-# default-zsk-algorithms=
-
-#################################
-# default-zsk-size     Default ZSK size (0 means default)
-#
-# default-zsk-size=0
-
-#################################
-# direct-dnskey        Fetch DNSKEY RRs from backend during DNSKEY synthesis
-#
-# direct-dnskey=no
-
-#################################
-# disable-axfr Disable zonetransfers but do allow TCP queries
-#
-# disable-axfr=no
-
-#################################
-# disable-axfr-rectify Disable the rectify step during an outgoing AXFR. Only required for regression testing.
-#
-# disable-axfr-rectify=no
-
-#################################
-# disable-syslog       Disable logging to syslog, useful when running inside a supervisor that logs stdout
-#
-# disable-syslog=no
-
-#################################
-# disable-tcp  Do not listen to TCP queries
-#
-# disable-tcp=no
-
-#################################
-# distributor-threads  Default number of Distributor (backend) threads to start
-#
-# distributor-threads=3
-
-#################################
-# dname-processing     If we should support DNAME records
-#
-# dname-processing=no
-
-#################################
-# dnssec-key-cache-ttl Seconds to cache DNSSEC keys from the database
-#
-# dnssec-key-cache-ttl=30
-
-#################################
-# dnsupdate    Enable/Disable DNS update (RFC2136) support. Default is no.
-#
-# dnsupdate=no
-
-#################################
-# do-ipv6-additional-processing        Do AAAA additional processing
-#
-# do-ipv6-additional-processing=yes
-
-#################################
-# domain-metadata-cache-ttl    Seconds to cache domain metadata from the database
-#
-# domain-metadata-cache-ttl=60
-
-#################################
-# edns-subnet-processing       If we should act on EDNS Subnet options
-#
-# edns-subnet-processing=no
-
-#################################
-# entropy-source       If set, read entropy from this file
-#
-# entropy-source=/dev/urandom
-
-#################################
-# experimental-lua-policy-script       Lua script for the policy engine
-#
-# experimental-lua-policy-script=
-
-#################################
-# forward-dnsupdate    A global setting to allow DNS update packages that are for a Slave domain, to be forwarded to the master.
-#
-# forward-dnsupdate=yes
-
-#################################
-# guardian     Run within a guardian process
-#
-# guardian=no
-
-#################################
-# include-dir  Include *.conf files from this directory
-#
-# include-dir=
-
-#################################
-# launch       Which backends to launch and order to query them in
-#
-# launch=
-
-#################################
-# load-modules Load this module - supply absolute or relative path
-#
-# load-modules=
-
-#################################
-# local-address        Local IP addresses to which we bind
-#
-# local-address=0.0.0.0
-
-#################################
-# local-address-nonexist-fail  Fail to start if one or more of the local-address's do not exist on this server
-#
-# local-address-nonexist-fail=yes
-
-#################################
-# local-ipv6   Local IP address to which we bind
-#
-# local-ipv6=::
-
-#################################
-# local-ipv6-nonexist-fail     Fail to start if one or more of the local-ipv6 addresses do not exist on this server
-#
-# local-ipv6-nonexist-fail=yes
-
-#################################
-# local-port   The port on which we listen
-#
-# local-port=53
-
-#################################
-# log-dns-details      If PDNS should log DNS non-erroneous details
-#
-# log-dns-details=no
-
-#################################
-# log-dns-queries      If PDNS should log all incoming DNS queries
-#
-# log-dns-queries=no
-
-#################################
-# logging-facility     Log under a specific facility
-#
-# logging-facility=
-
-#################################
-# loglevel     Amount of logging. Higher is more. Do not set below 3
-#
-# loglevel=4
-
-#################################
-# lua-prequery-script  Lua script with prequery handler (DO NOT USE)
-#
-# lua-prequery-script=
-
-#################################
-# master       Act as a master
-#
-# master=no
-
-#################################
-# max-cache-entries    Maximum number of cache entries
-#
-# max-cache-entries=1000000
-
-#################################
-# max-ent-entries      Maximum number of empty non-terminals in a zone
-#
-# max-ent-entries=100000
-
-#################################
-# max-nsec3-iterations Limit the number of NSEC3 hash iterations
-#
-# max-nsec3-iterations=500
-
-#################################
-# max-queue-length     Maximum queuelength before considering situation lost
-#
-# max-queue-length=5000
-
-#################################
-# max-signature-cache-entries  Maximum number of signatures cache entries
-#
-# max-signature-cache-entries=
-
-#################################
-# max-tcp-connections  Maximum number of TCP connections
-#
-# max-tcp-connections=10
-
-#################################
-# module-dir   Default directory for modules
-#
-# module-dir=/usr/local/lib/pdns
-
-#################################
-# negquery-cache-ttl   Seconds to store negative query results in the QueryCache
-#
-# negquery-cache-ttl=60
-
-#################################
-# no-shuffle   Set this to prevent random shuffling of answers - for regression testing
-#
-# no-shuffle=off
-
-#################################
-# non-local-bind       Enable binding to non-local addresses by using FREEBIND / BINDANY socket options
-#
-# non-local-bind=no
-
-#################################
-# only-notify  Only send AXFR NOTIFY to these IP addresses or netmasks
-#
-# only-notify=0.0.0.0/0,::/0
-
-#################################
-# out-of-zone-additional-processing    Do out of zone additional processing
-#
-# out-of-zone-additional-processing=yes
-
-#################################
-# outgoing-axfr-expand-alias   Expand ALIAS records during outgoing AXFR
-#
-# outgoing-axfr-expand-alias=no
-
-#################################
-# overload-queue-length        Maximum queuelength moving to packetcache only
-#
-# overload-queue-length=0
-
-#################################
-# prevent-self-notification    Don't send notifications to what we think is ourself
-#
-# prevent-self-notification=yes
-
-#################################
-# query-cache-ttl      Seconds to store query results in the QueryCache
-#
-# query-cache-ttl=20
-
-#################################
-# query-local-address  Source IP address for sending queries
-#
-# query-local-address=0.0.0.0
-
-#################################
-# query-local-address6 Source IPv6 address for sending queries
-#
-# query-local-address6=::
-
-#################################
-# query-logging        Hint backends that queries should be logged
-#
-# query-logging=no
-
-#################################
-# queue-limit  Maximum number of milliseconds to queue a query
-#
-# queue-limit=1500
-
-#################################
-# receiver-threads     Default number of receiver threads to start
-#
-# receiver-threads=1
-
-#################################
-# recursive-cache-ttl  Seconds to store packets for recursive queries in the PacketCache
-#
-# recursive-cache-ttl=10
-
-#################################
-# recursor     If recursion is desired, IP address of a recursing nameserver
-#
-# recursor=no
-
-#################################
-# retrieval-threads    Number of AXFR-retrieval threads for slave operation
-#
-# retrieval-threads=2
-
-#################################
-# reuseport    Enable higher performance on compliant kernels by using SO_REUSEPORT allowing each receiver thread to open its own socket
-#
-# reuseport=no
-
-#################################
-# security-poll-suffix Domain name from which to query security update notifications
-#
-# security-poll-suffix=secpoll.powerdns.com.
-
-#################################
-# server-id    Returned when queried for 'server.id' TXT or NSID, defaults to hostname - disabled or custom
-#
-# server-id=
-
-#################################
-# setgid       If set, change group id to this gid for more security
-#
-# setgid=
-
-#################################
-# setuid       If set, change user id to this uid for more security
-#
-# setuid=
-
-#################################
-# signing-threads      Default number of signer threads to start
-#
-# signing-threads=3
-
-#################################
-# slave        Act as a slave
-#
-# slave=no
-
-#################################
-# slave-cycle-interval Schedule slave freshness checks once every .. seconds
-#
-# slave-cycle-interval=60
-
-#################################
-# slave-renotify       If we should send out notifications for slaved updates
-#
-# slave-renotify=no
-
-#################################
-# soa-expire-default   Default SOA expire
-#
-# soa-expire-default=604800
-
-#################################
-# soa-minimum-ttl      Default SOA minimum ttl
-#
-# soa-minimum-ttl=3600
-
-#################################
-# soa-refresh-default  Default SOA refresh
-#
-# soa-refresh-default=10800
-
-#################################
-# soa-retry-default    Default SOA retry
-#
-# soa-retry-default=3600
-
-#################################
-# socket-dir   Where the controlsocket will live, /var/run when unset and not chrooted
-#
-# socket-dir=
-
-#################################
-# tcp-control-address  If set, PowerDNS can be controlled over TCP on this address
-#
-# tcp-control-address=
-
-#################################
-# tcp-control-port     If set, PowerDNS can be controlled over TCP on this address
-#
-# tcp-control-port=53000
-
-#################################
-# tcp-control-range    If set, remote control of PowerDNS is possible over these networks only
-#
-# tcp-control-range=127.0.0.0/8, 10.0.0.0/8, 192.168.0.0/16, 172.16.0.0/12, ::1/128, fe80::/10
-
-#################################
-# tcp-control-secret   If set, PowerDNS can be controlled over TCP after passing this secret
-#
-# tcp-control-secret=
-
-#################################
-# traceback-handler    Enable the traceback handler (Linux only)
-#
-# traceback-handler=yes
-
-#################################
-# trusted-notification-proxy   IP address of incoming notification proxy
-#
-# trusted-notification-proxy=
-
-#################################
-# udp-truncation-threshold     Maximum UDP response size before we truncate
-#
-# udp-truncation-threshold=1680
-
-#################################
-# version-string       PowerDNS version in packets - full, anonymous, powerdns or custom
-#
-# version-string=full
-
-#################################
-# webserver    Start a webserver for monitoring
-#
-# webserver=no
-
-#################################
-# webserver-address    IP Address of webserver to listen on
-#
-# webserver-address=127.0.0.1
-
-#################################
-# webserver-allow-from Webserver access is only allowed from these subnets
-#
-# webserver-allow-from=0.0.0.0/0,::/0
-
-#################################
-# webserver-password   Password required for accessing the webserver
-#
-# webserver-password=
-
-#################################
-# webserver-port       Port of webserver to listen on
-#
-# webserver-port=8081
-
-#################################
-# webserver-print-arguments    If the webserver should print arguments
-#
-# webserver-print-arguments=no
-
-#################################
-# write-pid    Write a PID file
-#
-# write-pid=yes
-
-

diff --git a/pdns/receiver.cc b/pdns/receiver.cc
index 6bc84997de6b0753f1bc13505af61082d1601082..6d597312ca116e87514f6307adb517aa9c97ed66 100644 (file)
--- a/pdns/receiver.cc
+++ b/pdns/receiver.cc
@@ -527,7 +527,7 @@ int main(int argc, char **argv)
     
     if(::arg().mustDo("config")) {
       cout<<::arg().configstring()<<endl;
-      exit(99);
+      exit(0);
     }
 
     if(::arg().mustDo("list-modules")) {

diff --git a/regression-tests.nobackend/pdnsconfdist/.gitignore b/regression-tests.nobackend/pdnsconfdist/.gitignore
deleted file mode 100644 (file)
index 298010b..0000000
--- a/regression-tests.nobackend/pdnsconfdist/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-pdns.conf-dist.out

diff --git a/regression-tests.nobackend/pdnsconfdist/command b/regression-tests.nobackend/pdnsconfdist/command
deleted file mode 100755 (executable)
index 2196541..0000000
--- a/regression-tests.nobackend/pdnsconfdist/command
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-$PDNS --config > pdnsconfdist/pdns.conf-dist.out
-diff -u ../pdns/pdns.conf-dist ./pdnsconfdist/pdns.conf-dist.out

diff --git a/regression-tests.nobackend/pdnsconfdist/description b/regression-tests.nobackend/pdnsconfdist/description
deleted file mode 100644 (file)
index 3585fe6..0000000
--- a/regression-tests.nobackend/pdnsconfdist/description
+++ /dev/null
@@ -1 +0,0 @@
-Compare pdns_server --config output to pdns.conf-dist.

diff --git a/regression-tests.nobackend/pdnsconfdist/expected_result b/regression-tests.nobackend/pdnsconfdist/expected_result
deleted file mode 100644 (file)
index e69de29..0000000