6 files changed, 99 insertions, 228 deletions

diff --git a/dns/powerdns/files/pdns.conf b/dns/powerdns/files/pdns.conf
index c539c38c2b81..07616949a456 100644
--- a/dns/powerdns/files/pdns.conf
+++ b/dns/powerdns/files/pdns.conf
@@ -29,7 +29,7 @@
 #ldap-secret (default "")
 #ldap-method (default "simple")
 #ldap-filter-axfr (default "(:target:)" )
-ldap-filter-lookup (default "(:target:)" )
+#ldap-filter-lookup (default "(:target:)" )
 
 # OpenDBX (check http://www.linuxnetworks.de for more information)
 #launch=opendbx
@@ -44,7 +44,7 @@ ldap-filter-lookup (default "(:target:)" )
 #################################
 # allow-axfr-ips	Allow zonetransfers only to these subnets
 #
-# allow-axfr-ips=0.0.0.0/0
+# allow-axfr-ips=0.0.0.0/0,::/0
 
 #################################
 # allow-recursion	List of subnets that are allowed to recurse
@@ -69,7 +69,7 @@ ldap-filter-lookup (default "(:target:)" )
 #################################
 # config-dir	Location of configuration directory (pdns.conf)
 #
-# config-dir=/usr/local/etc
+# config-dir=/usr/local/etc/pdns
 
 #################################
 # config-name	Name of this virtual configuration - will rename the binary image
@@ -117,6 +117,21 @@ ldap-filter-lookup (default "(:target:)" )
 # do-ipv6-additional-processing=no
 
 #################################
+# edns-subnet-option-number	EDNS option number to use
+#
+# edns-subnet-option-number=20730
+
+#################################
+# 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
+
+#################################
 # fancy-records	Process URL and MBOXFW records
 #
 # fancy-records=no
@@ -162,12 +177,17 @@ ldap-filter-lookup (default "(:target:)" )
 # log-dns-details=
 
 #################################
+# log-dns-queries	If PDNS should log all incoming DNS queries
+#
+# log-dns-queries=no
+
+#################################
 # log-failed-updates	If PDNS should log failed update requests
 #
 # log-failed-updates=
 
 #################################
-# logfile	Logfile to use
+# logfile	Logfile to use (Windows only)
 #
 # logfile=pdns.log
 
@@ -187,6 +207,11 @@ ldap-filter-lookup (default "(:target:)" )
 # master=no
 
 #################################
+# max-cache-entries	Maximum number of cache entries
+#
+# max-cache-entries=1000000
+
+#################################
 # max-queue-length	Maximum queuelength before considering situation lost
 #
 # max-queue-length=5000
@@ -217,6 +242,16 @@ ldap-filter-lookup (default "(:target:)" )
 # out-of-zone-additional-processing=yes
 
 #################################
+# overload-queue-length	Maximum queuelength moving to packetcache only
+#
+# overload-queue-length=0
+
+#################################
+# per-zone-axfr-acls	When set, backends that implement it perform per-zone AXFL ACL checks
+#
+# per-zone-axfr-acls=off
+
+#################################
 # pipebackend-abi-version	Version of the pipe backend ABI
 #
 # pipebackend-abi-version=1
@@ -229,7 +264,12 @@ ldap-filter-lookup (default "(:target:)" )
 #################################
 # query-local-address	Source IP address for sending queries
 #
-# query-local-address=
+# 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
@@ -242,6 +282,11 @@ ldap-filter-lookup (default "(:target:)" )
 # queue-limit=1500
 
 #################################
+# receiver-threads	Default number of Distributor (backend) threads to start
+#
+# receiver-threads=1
+
+#################################
 # recursive-cache-ttl	Seconds to store packets in the PacketCache
 #
 # recursive-cache-ttl=10
@@ -252,11 +297,21 @@ ldap-filter-lookup (default "(:target:)" )
 # recursor=no
 
 #################################
+# retrieval-threads	Number of AXFR-retrieval threads for slave operation
+#
+# retrieval-threads=2
+
+#################################
 # send-root-referral	Send out old-fashioned root-referral instead of ServFail in case of no authority
 #
 # send-root-referral=no
 
 #################################
+# server-id	Returned when queried for 'server.id' TXT or NSID, defaults to hostname
+#
+# server-id=
+
+#################################
 # setgid	If set, change group id to this gid for more security
 #
 # setgid=
@@ -267,6 +322,11 @@ ldap-filter-lookup (default "(:target:)" )
 # setuid=
 
 #################################
+# signing-threads	Default number of signer threads to start
+#
+# signing-threads=3
+
+#################################
 # skip-cname	Do not perform CNAME indirection for each query
 #
 # skip-cname=no
@@ -282,6 +342,11 @@ ldap-filter-lookup (default "(:target:)" )
 # slave-cycle-interval=60
 
 #################################
+# slave-renotify	If we should send out notifications for slaved updates
+#
+# slave-renotify=no
+
+#################################
 # smtpredirector	Our smtpredir MX host
 #
 # smtpredirector=a.misconfigured.powerdns.smtp.server
@@ -322,12 +387,37 @@ ldap-filter-lookup (default "(:target:)" )
 # strict-rfc-axfrs=no
 
 #################################
+# 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=
+
+#################################
+# trusted-notification-proxy	IP address of incoming notification proxy
+#
+# trusted-notification-proxy=
+
+#################################
 # urlredirector	Where we send hosts to that need to be url redirected
 #
 # urlredirector=127.0.0.1
 
 #################################
-# use-logfile	Use a log file
+# use-logfile	Use a log file (Windows only)
 #
 # use-logfile=no
 
@@ -370,3 +460,5 @@ ldap-filter-lookup (default "(:target:)" )
 # wildcards	Honor wildcards in the database
 #
 # wildcards=
+
+
diff --git a/dns/powerdns/files/pdns.in b/dns/powerdns/files/pdns.in
index 164f222c13e8..5d4e241c4e81 100644
--- a/dns/powerdns/files/pdns.in
+++ b/dns/powerdns/files/pdns.in
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: pdns_server
-# REQUIRE: DAEMON
+# REQUIRE: DAEMON %%MYSQL%% %%PGSQL%% %%SLAPD%%
 # KEYWORD: shutdown
 
 #
diff --git a/dns/powerdns/files/tables-mssql_or_sybase.sql b/dns/powerdns/files/tables-mssql_or_sybase.sql
deleted file mode 100644
index 5b815186cfee..000000000000
--- a/dns/powerdns/files/tables-mssql_or_sybase.sql
+++ /dev/null
@@ -1,56 +0,0 @@
-SET quoted_identifier ON;
-
-
-CREATE TABLE "domains" (
-	"id" INTEGER NOT NULL IDENTITY,
-	"name" VARCHAR(255) NOT NULL,
-	"type" VARCHAR(6) NOT NULL,
-	"master" VARCHAR(40) DEFAULT '' NOT NULL,
-	"account" VARCHAR(40) DEFAULT '' NOT NULL,
-	"notified_serial" INTEGER NULL,
-	"last_check" INTEGER NULL,
-	"status" CHAR(1) DEFAULT 'A' NOT NULL,
-CONSTRAINT "pk_domains_id"
-	PRIMARY KEY ("id"),
-CONSTRAINT "unq_domains_name"
-	UNIQUE ("name")
-);
-
-CREATE INDEX "idx_domains_status_type" ON "domains" ("status","type");
-
-
-
-CREATE TABLE "records" (
-	"id" INTEGER NOT NULL IDENTITY,
-	"domain_id" INTEGER NOT NULL,
-	"name" VARCHAR(255) NOT NULL,
-	"type" VARCHAR(6) NOT NULL,
-	"ttl" INTEGER NULL,
-	"prio" INTEGER NULL,
-	"content" VARCHAR(255) NOT NULL,
-	"change_date" INTEGER NULL,
-CONSTRAINT "pk_records_id"
-	PRIMARY KEY ("id"),
-CONSTRAINT "fk_records_domainid"
-	FOREIGN KEY ("domain_id")
-	REFERENCES "domains" ("id")
-);
-
-CREATE INDEX "idx_records_name_type" ON "records" ("name","type");
-CREATE INDEX "idx_records_type" ON "records" ("type");
-
-
-
-CREATE TABLE "supermasters" (
-	"ip" VARCHAR(40) NOT NULL,
-	"nameserver" VARCHAR(255) NOT NULL,
-	"account" VARCHAR(40) DEFAULT '' NOT NULL
-);
-
-CREATE INDEX "idx_smip_smns" ON "supermasters" ("ip","nameserver");
-
-
-
-GRANT SELECT ON "supermasters" TO "powerdns";
-GRANT ALL ON "domains" TO "powerdns";
-GRANT ALL ON "records" TO "powerdns";
diff --git a/dns/powerdns/files/tables-mysql.sql b/dns/powerdns/files/tables-mysql.sql
deleted file mode 100644
index c57d45c1dee1..000000000000
--- a/dns/powerdns/files/tables-mysql.sql
+++ /dev/null
@@ -1,57 +0,0 @@
-SET SESSION sql_mode='ANSI';
-
-CREATE TABLE "domains" (
-	"id" INTEGER NOT NULL AUTO_INCREMENT,
-	"name" VARCHAR(255) NOT NULL,
-	"type" VARCHAR(6) NOT NULL,
-	"master" VARCHAR(40) NOT NULL DEFAULT '',
-	"account" VARCHAR(40) NOT NULL DEFAULT '',
-	"notified_serial" INTEGER DEFAULT NULL,
-	"last_check" INTEGER DEFAULT NULL,
-	"status" CHAR(1) NOT NULL DEFAULT 'A',
-CONSTRAINT "pk_domains_id"
-	PRIMARY KEY ("id"),
-CONSTRAINT "unq_domains_name"
-	UNIQUE ("name")
-) type=InnoDB;
-
-CREATE INDEX "idx_domains_status_type" ON "domains" ("status","type");
-
-
-
-CREATE TABLE "records" (
-	"id" INTEGER NOT NULL AUTO_INCREMENT,
-	"domain_id" INTEGER NOT NULL,
-	"name" VARCHAR(255) NOT NULL,
-	"type" VARCHAR(6) NOT NULL,
-	"ttl" INTEGER DEFAULT NULL,
-	"prio" INTEGER DEFAULT NULL,
-	"content" VARCHAR(255) NOT NULL,
-	"change_date" INTEGER DEFAULT NULL,
-CONSTRAINT "pk_records_id"
-	PRIMARY KEY ("id"),
-CONSTRAINT "fk_records_domainid"
-	FOREIGN KEY ("domain_id")
-	REFERENCES "domains" ("id")
-	ON UPDATE CASCADE
-	ON DELETE CASCADE
-) type=InnoDB;
-
-CREATE INDEX "idx_records_name_type" ON "records" ("name","type");
-CREATE INDEX "idx_records_type" ON "records" ("type");
-
-
-
-CREATE TABLE "supermasters" (
-	"ip" VARCHAR(40) NOT NULL,
-	"nameserver" VARCHAR(255) NOT NULL,
-	"account" VARCHAR(40) NOT NULL DEFAULT ''
-);
-
-CREATE INDEX "idx_smip_smns" ON "supermasters" ("ip","nameserver");
-
-
-
-GRANT SELECT ON "supermasters" TO "powerdns";
-GRANT ALL ON "domains" TO "powerdns";
-GRANT ALL ON "records" TO "powerdns";
diff --git a/dns/powerdns/files/tables-pgsql.sql b/dns/powerdns/files/tables-pgsql.sql
deleted file mode 100644
index 5d8afcb7032c..000000000000
--- a/dns/powerdns/files/tables-pgsql.sql
+++ /dev/null
@@ -1,57 +0,0 @@
-CREATE TABLE "domains" (
-	"id" SERIAL NOT NULL,
-	"name" VARCHAR(255) NOT NULL,
-	"type" VARCHAR(6) NOT NULL,
-	"master" VARCHAR(40) NOT NULL DEFAULT '',
-	"account" VARCHAR(40) NOT NULL DEFAULT '',
-	"notified_serial" INTEGER DEFAULT NULL,
-	"last_check" INTEGER DEFAULT NULL,
-	"status" CHAR(1) NOT NULL DEFAULT 'A',
-CONSTRAINT "pk_domains_id"
-	PRIMARY KEY ("id"),
-CONSTRAINT "unq_domains_name"
-	UNIQUE ("name")
-);
-
-CREATE INDEX "idx_domains_status_type" ON "domains" ("status","type");
-
-
-
-CREATE TABLE "records" (
-	"id" SERIAL NOT NULL,
-	"domain_id" INTEGER NOT NULL,
-	"name" VARCHAR(255) NOT NULL,
-	"type" VARCHAR(6) NOT NULL,
-	"ttl" INTEGER DEFAULT NULL,
-	"prio" INTEGER DEFAULT NULL,
-	"content" VARCHAR(255) NOT NULL,
-	"change_date" INTEGER DEFAULT NULL,
-CONSTRAINT "pk_records_id"
-	PRIMARY KEY ("id"),
-CONSTRAINT "fk_records_domainid"
-	FOREIGN KEY ("domain_id")
-	REFERENCES domains ("id")
-	ON UPDATE CASCADE
-	ON DELETE CASCADE
-);
-
-CREATE INDEX "idx_records_name_type" ON "records" ("name","type");
-CREATE INDEX "idx_records_type" ON "records" ("type");
-
-
-
-CREATE TABLE "supermasters" (
-	"ip" VARCHAR(40) NOT NULL,
-	"nameserver" VARCHAR(255) NOT NULL,
-	"account" VARCHAR(40) NOT NULL DEFAULT ''
-);
-
-CREATE INDEX "idx_smaster_ip_ns" ON "supermasters" ("ip","nameserver");
-
-
-
-GRANT SELECT ON "supermasters" TO "powerdns";
-GRANT ALL ON "domains" TO "powerdns";
-GRANT ALL ON "domains_id_seq" TO "powerdns";
-GRANT ALL ON "records" TO "powerdns";
-GRANT ALL ON "records_id_seq" TO "powerdns";
diff --git a/dns/powerdns/files/tables-sqlite.sql b/dns/powerdns/files/tables-sqlite.sql
deleted file mode 100644
index 0491ac280d7f..000000000000
--- a/dns/powerdns/files/tables-sqlite.sql
+++ /dev/null
@@ -1,51 +0,0 @@
-CREATE TABLE "domains" (
-	"id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	"name" VARCHAR(255) NOT NULL,
-	"type" VARCHAR(6) NOT NULL,
-	"master" VARCHAR(40) NOT NULL DEFAULT '',
-	"account" VARCHAR(40) NOT NULL DEFAULT '',
-	"notified_serial" INTEGER DEFAULT NULL,
-	"last_check" INTEGER DEFAULT NULL,
-	"status" CHAR(1) NOT NULL DEFAULT 'A',
-CONSTRAINT "unq_domains_name"
-	UNIQUE ("name")
-);
-
-CREATE INDEX "idx_domains_status_type" ON "domains" ("status","type");
-
-
-
-CREATE TABLE "records" (
-	"id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	"domain_id" INTEGER NOT NULL,
-	"name" VARCHAR(255) NOT NULL,
-	"type" VARCHAR(6) NOT NULL,
-	"ttl" INTEGER DEFAULT NULL,
-	"prio" INTEGER DEFAULT NULL,
-	"content" VARCHAR(255) NOT NULL,
-	"change_date" INTEGER DEFAULT NULL,
-CONSTRAINT "fk_records_domainid"
-	FOREIGN KEY ("domain_id")
-	REFERENCES "domains" ("id")
-	ON UPDATE CASCADE
-	ON DELETE CASCADE
-);
-
-CREATE INDEX "idx_records_name_type" ON "records" ("name","type");
-CREATE INDEX "idx_records_type" ON "records" ("type");
-
-
-
-CREATE TABLE "supermasters" (
-	"ip" VARCHAR(40) NOT NULL,
-	"nameserver" VARCHAR(255) NOT NULL,
-	"account" VARCHAR(40) NOT NULL DEFAULT ''
-);
-
-CREATE INDEX "idx_smip_smns" ON "supermasters" ("ip","nameserver");
-
-
-
-GRANT SELECT ON "supermasters" TO "powerdns";
-GRANT ALL ON "domains" TO "powerdns";
-GRANT ALL ON "records" TO "powerdns";