Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Oct 2014 20:08:32 +0000 (UTC)
From:      Kurt Jaeger <pi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r371076 - in head/dns/powerdns: . files
Message-ID:  <201410172008.s9HK8W69045404@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pi
Date: Fri Oct 17 20:08:32 2014
New Revision: 371076
URL: https://svnweb.freebsd.org/changeset/ports/371076
QAT: https://qat.redports.org/buildarchive/r371076/

Log:
  dns/powerdns: 3.3.1 -> 3.4.0
  
  Changelog
  http://doc.powerdns.com/html/changelog.html#changelog-auth-3.4.0
  
  - Moved remote backend to regular (was experimental)
  - Added the GeoIP, LMDB (both experimental) and Bind backend
  - Removed Crypto++ support (as suggested by the author)
  - Fixed the Luabackend on i386
  - Added note to pkg-message about mandatory schema changes for
    gmysql, gpgsql and gsqlite3 backends
  - Changed the example pdns.conf to include all possible configuration
    options when all backends are enabled
  
  PR:		194057
  Submitted by:	me@nileshgr.com, updated by tremere@cainites.net
  Approved by:	Ralf van der Enden <tremere@cainites.net> (maintainer)

Modified:
  head/dns/powerdns/Makefile
  head/dns/powerdns/distinfo
  head/dns/powerdns/files/patch-pdns__Makefile.in
  head/dns/powerdns/files/pdns.conf
  head/dns/powerdns/files/pdns.in
  head/dns/powerdns/files/pkg-message.in
  head/dns/powerdns/pkg-plist

Modified: head/dns/powerdns/Makefile
==============================================================================
--- head/dns/powerdns/Makefile	Fri Oct 17 19:35:32 2014	(r371075)
+++ head/dns/powerdns/Makefile	Fri Oct 17 20:08:32 2014	(r371076)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	powerdns
-PORTVERSION=	3.3.1
-PORTREVISION=	5
+PORTVERSION=	3.4.0
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 DISTNAME=	pdns-${PORTVERSION}
@@ -16,15 +15,16 @@ LIB_DEPENDS=	libboost_serialization.so:$
 
 CONFLICTS=	powerdns-devel-[2-3].[0-9]*
 
-USES=		gmake libtool lua:51 pkgconfig
+USES=		gmake libtool lua:51 pkgconfig tar:bzip2
+USE_LDCONFIG=	YES
 USE_SUBMAKE=	YES
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=	YES
 INSTALL_TARGET=	install-strip
 CXXFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-static \
 		--with-modules="" \
-		--with-dynmodules="pipe ${MODULES}" \
+		--with-dynmodules="pipe bind ${MODULES}" \
 		--sysconfdir="${PREFIX}/etc/pdns" \
 		--with-boost="${LOCALBASE}"
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
@@ -32,38 +32,35 @@ SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFI
 		MKDIR="${MKDIR}" \
 		DISTNAME="${DISTNAME}" \
 		POWERDNS_OPTIONS="${POWERDNS_OPTIONS}"
+# DOCSDIR=	${PREFIX}/share/doc/pdns
 
 SUB_FILES=	pkg-message
 
 USE_RC_SUBR=	pdns
 
-OPTIONS_DEFINE=	GEO MYSQL MYSQL_LOCAL OPENDBX OPENLDAP OPENLDAP_LOCAL \
-		PGSQL PGSQL_LOCAL POLARSSL SQLITE3 TOOLS
+OPTIONS_DEFINE=	GEO MYSQL OPENDBX OPENLDAP PGSQL POLARSSL REMOTE SQLITE3 TOOLS
 OPTIONS_GROUP=	DNSSEC EXPERIMENTAL
-OPTIONS_GROUP_DNSSEC=	BOTAN110 CRYPTOPP
-OPTIONS_GROUP_EXPERIMENTAL=	LUA MYDNS REMOTE REMOTE_HTTP TINYDNS
+OPTIONS_GROUP_DNSSEC=	BOTAN110
+OPTIONS_GROUP_EXPERIMENTAL=	GEOIP LMDB LUA MYDNS TINYDNS
 
 PGSQL_DESC=		PostgreSQL backend
-PGSQL_LOCAL_DESC=	RUN_DEPEND on PostgreSQL server
 MYSQL_DESC=		MySQL backend
-MYSQL_LOCAL_DESC=	RUN_DEPEND on MySQL server
 OPENDBX_DESC=		OpenDBX backend
 OPENLDAP_DESC=		OpenLDAP backend
-OPENLDAP_LOCAL_DESC=	RUN_DEPEND on OpenLDAP server
 SQLITE3_DESC=		SQLite 3 backend
 GEO_DESC=		Geo backend
+GEOIP_DESC=		GeoIP backend
 DNSSEC_DESC=		Extra DNSSEC options
 BOTAN110_DESC=		Faster signing + ECDSA & GOST algorithms
-CRYPTOPP_DESC=		ECDSA algorithms
 POLARSSL_DESC=		Use embedded PolarSSL
+LMDB_DESC=		LMDB backend
 LUA_DESC=		Lua backend
 MYDNS_DESC=		MyDNS backend
 REMOTE_DESC=		Remote backend
-REMOTE_HTTP_DESC=	Enable HTTP for the Remote backed
 TINYDNS_DESC=		TinyDNS backend
 TOOLS_DESC=		Build extra tools
 
-OPTIONS_DEFAULT=	PGSQL DNSSEC BOTAN110 POLARSSL
+OPTIONS_DEFAULT=	PGSQLDB DNSSEC BOTAN110 POLARSSL
 
 OPTIONS_SUB=	yes
 
@@ -74,43 +71,43 @@ TOOLS_CONFIGURE_ON=	--enable-tools
 
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 PGSQL_CONFIGURE_OFF=	--without-pgsql
-PGSQL_USE=		PGSQL=YES
-PGSQL_LOCAL_USE=	PGSQL=server
+PGSQL_USES=		pgsql
 
 MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
 MYSQL_CONFIGURE_OFF=	--without-mysql
 MYSQL_USE=		MYSQL=YES
-MYSQL_LOCAL_USE=	MYSQL=server
 
 MYDNS_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
 MYDNS_USE=		MYSQL=YES
-MYDNS_LOCAL_USE=	MYSQL=server
 
 OPENLDAP_CXXFLAGS=	-DLDAP_DEPRECATED=1
 OPENLDAP_USE=		OPENLDAP=YES
-OPENLDAP_LOCAL_RUN_DEPENDS=	openldap-server>=0:${PORTSDIR}/net/openldap24-server
 
-REMOTE_HTTP_CONFIGURE_ON=	--enable-remotebackend-http
-REMOTE_HTTP_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-
-CRYPTOPP_CONFIGURE_ON=		--enable-cryptopp
-
-SQLITE3_USE=	SQLITE=3
+SQLITE3_USE=		SQLITE=3
 
 OPENDBX_LIB_DEPENDS=	libopendbx.so:${PORTSDIR}/databases/opendbx
 
-BOTAN110_CONFIGURE_ON=		--enable-botan1.10
-BOTAN110_LIB_DEPENDS=		libbotan-1.10.so:${PORTSDIR}/security/botan110
+BOTAN110_CONFIGURE_ON=	--enable-botan1.10
+BOTAN110_LIB_DEPENDS=	libbotan-1.10.so:${PORTSDIR}/security/botan110
 
 TINYDNS_LIB_DEPENDS=	libcdb.so:${PORTSDIR}/databases/tinycdb
 TINYDNS_CONFIGURE_ON=	CDB_LIBS="-L${LOCALBASE}/lib -lcdb" CDB_CFLAGS="-I${LOCALBASE}/include"
 
+LMDB_LIB_DEPENDS=	liblmdb.so:${PORTSDIR}/databases/lmdb
+
+GEOIP_LIB_DEPENDS=	libyaml-cpp.so:${PORTSDIR}/devel/yaml-cpp \
+			libGeoIP.so:${PORTSDIR}/net/GeoIP
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGEO}
 MODULES+=	geo
 .endif
 
+.if ${PORT_OPTIONS:MGEOIP}
+MODULES+=	geoip
+.endif
+
 .if ${PORT_OPTIONS:MPGSQL}
 MODULES+=	gpgsql
 .endif
@@ -119,32 +116,18 @@ MODULES+=	gpgsql
 MODULES+=	gmysql
 .endif
 
-.if ${PORT_OPTIONS:MPGSQL_LOCAL}
-SUB_LIST+=	PGSQL_REQ=postgresql
-.else
-SUB_LIST+=	PGSQL_REQ=
-.endif
-
-.if ${PORT_OPTIONS:MMYSQL_LOCAL}
-SUB_LIST+=	MYSQL_REQ=mysql
-.else
-SUB_LIST+=	MYSQL_REQ=
-.endif
-
 .if ${PORT_OPTIONS:MOPENLDAP}
 MODULES+=	ldap
 .endif
 
-.if ${PORT_OPTIONS:MOPENLDAP_LOCAL}
-SUB_LIST+=	SLAPD_REQ=slapd
-.else
-SUB_LIST+=	SLAPD_REQ=
-.endif
-
 .if ${PORT_OPTIONS:MSQLITE3}
 MODULES+=	gsqlite3
 .endif
 
+.if ${PORT_OPTIONS:MLMDB}
+MODULES+=	lmdb
+.endif
+
 .if ${PORT_OPTIONS:MLUA}
 MODULES+=	lua
 .endif
@@ -165,14 +148,6 @@ MODULES+=	tinydns
 MODULES+=	opendbx
 .endif
 
-.if ${PORT_OPTIONS:MCRYPTOPP}
-.	if exists(${LOCALBASE}/lib/libcryptopp.so)
-LIB_DEPENDS+=	libcryptopp.so:${PORTSDIR}/security/cryptopp
-.	else
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
-.	endif
-.endif
-
 .if ${PORT_OPTIONS:MPOLARSSL}
 CONFIGURE_ARGS+=	--without-system-polarssl
 .else

Modified: head/dns/powerdns/distinfo
==============================================================================
--- head/dns/powerdns/distinfo	Fri Oct 17 19:35:32 2014	(r371075)
+++ head/dns/powerdns/distinfo	Fri Oct 17 20:08:32 2014	(r371076)
@@ -1,2 +1,2 @@
-SHA256 (pdns-3.3.1.tar.gz) = feb566994725e049391e9b862c9437ca545f1bb970143d2387e474a6ff645bf3
-SIZE (pdns-3.3.1.tar.gz) = 1403435
+SHA256 (pdns-3.4.0.tar.bz2) = 0780f7a7fe768f9debc9decadb5d3a555b716eed14296e7c41f355bf8db4825e
+SIZE (pdns-3.4.0.tar.bz2) = 1234318

Modified: head/dns/powerdns/files/patch-pdns__Makefile.in
==============================================================================
--- head/dns/powerdns/files/patch-pdns__Makefile.in	Fri Oct 17 19:35:32 2014	(r371075)
+++ head/dns/powerdns/files/patch-pdns__Makefile.in	Fri Oct 17 20:08:32 2014	(r371076)
@@ -1,49 +1,20 @@
---- ./pdns/Makefile.in.orig	2013-12-17 14:47:45.000000000 +0100
-+++ ./pdns/Makefile.in	2014-01-16 13:37:09.328942976 +0100
-@@ -66,7 +66,7 @@
- 	nproxy$(EXEEXT) notify$(EXEEXT) pdnssec$(EXEEXT) \
- 	dnsbulktest$(EXEEXT) nsec3dig$(EXEEXT)
- @BOTAN110_TRUE@am__append_4 = botan110signers.cc botansigners.cc
--@BOTAN110_TRUE@am__append_5 = $(BOTAN110_LIBS) -lgmp -lrt
-+@BOTAN110_TRUE@am__append_5 = $(BOTAN110_LIBS)
- @BOTAN18_TRUE@am__append_6 = botan18signers.cc botansigners.cc
- @BOTAN18_TRUE@am__append_7 = $(BOTAN18_LIBS) -lgmp
- @CRYPTOPP_TRUE@am__append_8 = cryptoppsigners.cc
-@@ -74,7 +74,7 @@
- @SQLITE3_TRUE@am__append_10 = ssqlite3.cc ssqlite3.hh
- @ORACLE_TRUE@am__append_11 = $(ORACLE_LIBS)
- @BOTAN110_TRUE@am__append_12 = botan110signers.cc botansigners.cc
--@BOTAN110_TRUE@am__append_13 = $(BOTAN110_LIBS) -lgmp -lrt
-+@BOTAN110_TRUE@am__append_13 = $(BOTAN110_LIBS)
- @BOTAN18_TRUE@am__append_14 = botan18signers.cc botansigners.cc
- @BOTAN18_TRUE@am__append_15 = $(BOTAN18_LIBS) -lgmp
- @CRYPTOPP_TRUE@am__append_16 = cryptoppsigners.cc
-@@ -750,8 +750,8 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CXXFLAGS = -DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) $(POLARSSL_CFLAGS) -Iext/rapidjson/include
--AM_CPPFLAGS = -Ibackends/bind $(BOOST_CPPFLAGS) @THREADFLAGS@ \
--	$(LIBCURL_CFLAGS) $(am__append_1) $(am__append_2)
-+AM_CPPFLAGS = -Ibackends/bind @THREADFLAGS@ \
-+	$(am__append_1) $(am__append_2) $(BOOST_CPPFLAGS)
- EXTRA_DIST = dnslabeltext.rl dnslabeltext.cc mtasker.cc inflighter.cc docs/pdns_control.8  \
- 	docs/pdns_server.8 docs/zone2sql.8 docs/zone2ldap.8 docs/pdnssec.8 \
- 	docs/dnsreplay.8 docs/dnsscope.8 docs/dnswasher.8 docs/pdnssec.8 docs/zone2ldap.8 \
-@@ -797,7 +797,7 @@
- #
- pdns_server_LDFLAGS = @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_SERIALIZATION_LDFLAGS) -rdynamic
- pdns_server_LDADD = $(POLARSSL_LIBS) $(BOOST_SERIALIZATION_LIBS) \
--	$(LUA_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(am__append_5) \
-+	$(LUA_LIBS) $(SQLITE3_LIBS) $(am__append_5) \
- 	$(am__append_7) $(am__append_9) $(am__append_11)
- pdnssec_SOURCES = pdnssec.cc dbdnsseckeeper.cc sstuff.hh dnsparser.cc \
- 	dnsparser.hh dnsrecords.cc dnswriter.cc dnswriter.hh misc.cc \
-@@ -819,7 +819,7 @@
- 	$(am__append_18)
- pdnssec_LDFLAGS = @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) 
- pdnssec_LDADD = $(POLARSSL_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) \
--	$(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) \
-+	$(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) \
- 	$(am__append_13) $(am__append_15) $(am__append_17) \
- 	$(am__append_19)
- sdig_SOURCES = sdig.cc sstuff.hh dnsparser.cc dnsparser.hh dnsrecords.cc dnswriter.cc dnslabeltext.cc dnswriter.hh \
+--- pdns/Makefile.in.orig	2014-09-30 09:23:53 UTC
++++ pdns/Makefile.in
+@@ -70,7 +70,7 @@
+ 	notify$(EXEEXT) dnsbulktest$(EXEEXT) nsec3dig$(EXEEXT) \
+ 	saxfr$(EXEEXT)
+ @BOTAN110_TRUE@am__append_5 = botan110signers.cc botansigners.cc
+-@BOTAN110_TRUE@am__append_6 = $(BOTAN110_LIBS) -lgmp -lrt
++@BOTAN110_TRUE@am__append_6 = $(BOTAN110_LIBS)
+ @BOTAN18_TRUE@am__append_7 = botan18signers.cc botansigners.cc
+ @BOTAN18_TRUE@am__append_8 = $(BOTAN18_LIBS) -lgmp
+ @CRYPTOPP_TRUE@am__append_9 = cryptoppsigners.cc
+@@ -81,7 +81,7 @@
+ @PKCS11_TRUE@am__append_14 = $(P11KIT1_LIBS)
+ @LMDB_TRUE@am__append_15 = zone2lmdb
+ @BOTAN110_TRUE@am__append_16 = botan110signers.cc botansigners.cc
+-@BOTAN110_TRUE@am__append_17 = $(BOTAN110_LIBS) -lgmp -lrt
++@BOTAN110_TRUE@am__append_17 = $(BOTAN110_LIBS)
+ @BOTAN18_TRUE@am__append_18 = botan18signers.cc botansigners.cc
+ @BOTAN18_TRUE@am__append_19 = $(BOTAN18_LIBS) -lgmp
+ @CRYPTOPP_TRUE@am__append_20 = cryptoppsigners.cc

Modified: head/dns/powerdns/files/pdns.conf
==============================================================================
--- head/dns/powerdns/files/pdns.conf	Fri Oct 17 19:35:32 2014	(r371075)
+++ head/dns/powerdns/files/pdns.conf	Fri Oct 17 20:08:32 2014	(r371076)
@@ -1,140 +1,1238 @@
-# MySQL
-#launch=gmysql
-#gmysql-host=127.0.0.1
-#gmysql-dbname=pdns
-#gmysql-user=pdns
-#gmysql-password=pdns
-
-# PostgreSQL
-#launch=gpgsql
-#gpgsql-host=127.0.0.1
-#gpgsql-dbname=pdns
-#gpgsql-user=pdns
-#gpgsql-password=pdns
-
-# SQLite 2
-#launch=gsqlite
-#gsqlite-database=<path to your SQLite database>
-
-# SQLite 3
-#launch=gsqlite3
-#gsqlite3-database=<path to your SQLite database>
-
-# LDAP (check http://www.linuxnetworks.de for more information)
-#launch=ldap
-#ldap-host (default "127.0.0.1:389")
-#ldap-starttls (default "no")
-#ldap-basedn (default "")
-#ldap-binddn (default "")
-#ldap-secret (default "")
-#ldap-method (default "simple")
-#ldap-filter-axfr (default "(:target:)" )
-#ldap-filter-lookup (default "(:target:)" )
-
-# OpenDBX (check http://www.linuxnetworks.de for more information)
-#launch=opendbx
-#opendbx-backend (default "mysql")
-#opendbx-host-read (default "127.0.0.1")
-#opendbx-host-write (default "127.0.0.1")
-#opendbx-database (default "powerdns")
-#opendbx-username (default "powerdns")
-#opendbx-password (default "")
+# 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-recursion	List of subnets that are allowed to recurse
+#
+# allow-recursion=0.0.0.0/0
+
+#################################
+# 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
+
+#################################
+# bind-check-interval	Interval for zonefile changes
+#
+# bind-check-interval=0
+
+#################################
+# bind-config	Location of named.conf
+#
+# bind-config=
+
+#################################
+# bind-dnssec-db	Filename to store & access our DNSSEC metadatabase, empty for none
+#
+# bind-dnssec-db=
+
+#################################
+# bind-hybrid	Store DNSSEC metadata in other backend
+#
+# bind-hybrid=no
+
+#################################
+# bind-ignore-broken-records	Ignore records that are out-of-bound for the zone.
+#
+# bind-ignore-broken-records=no
+
+#################################
+# bind-supermaster-config	Location of (part of) named.conf where pdns can write zone-statements to
+#
+# bind-supermaster-config=
+
+#################################
+# bind-supermaster-destdir	Destination directory for newly added slave zones
+#
+# bind-supermaster-destdir=/usr/local/etc/pdns
+
+#################################
+# bind-supermasters	List of IP-addresses of supermasters
+#
+# bind-supermasters=
+
+#################################
+# 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/pdns
+
+#################################
+# 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=rsasha256
+
+#################################
+# default-ksk-size	Default KSK size (0 means default)
+#
+# default-ksk-size=0
+
+#################################
+# 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=rsasha256
+
+#################################
+# 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-tcp	Do not listen to TCP queries
+#
+# disable-tcp=no
+
+#################################
+# distributor-threads	Default number of Distributor (backend) threads to start
+#
+# distributor-threads=3
+
+#################################
+# do-ipv6-additional-processing	Do AAAA additional processing
+#
+# do-ipv6-additional-processing=yes
+
+#################################
+# 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-api-readonly	If the JSON API should disallow data modification
+#
+# experimental-api-readonly=no
+
+#################################
+# experimental-dname-processing	If we should support DNAME records
+#
+# experimental-dname-processing=no
+
+#################################
+# experimental-dnsupdate	Enable/Disable DNS update (RFC2136) support. Default is no.
+#
+# experimental-dnsupdate=no
+
+#################################
+# experimental-json-interface	If the webserver should serve JSON data
+#
+# experimental-json-interface=no
+
+#################################
+# experimental-logfile	Filename of the log file for JSON parser
+#
+# experimental-logfile=/var/log/pdns.log
+
+#################################
+# 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
+
+#################################
+# geo-ip-map-zonefile	path to the rbldnsd format zonefile
+#
+# geo-ip-map-zonefile=zz.countries.nerd.dk.rbldnsd
+
+#################################
+# geo-maps	list of paths to director maps or directories containing director map files
+#
+# geo-maps=
+
+#################################
+# geo-ns-records	targets of the NS records, comma separated.
+#
+# geo-ns-records=
+
+#################################
+# geo-ns-ttl	TTL value for NS records
+#
+# geo-ns-ttl=86400
+
+#################################
+# geo-soa-values	values of the SOA master nameserver and hostmaster fields, comma separated
+#
+# geo-soa-values=
+
+#################################
+# geo-ttl	TTL value for geo records
+#
+# geo-ttl=3600
+
+#################################
+# geo-zone	zonename to be served
+#
+# geo-zone=
+
+#################################
+# geoip-database-cache	Cache mode (standard, memory, index, mmap)
+#
+# geoip-database-cache=standard
+
+#################################
+# geoip-database-file	File to load IPv4 geoip data from
+#
+# geoip-database-file=/usr/share/GeoIP/GeoIP.dat
+
+#################################
+# geoip-database-file6	File to load IPv6 geoip data from
+#
+# geoip-database-file6=/usr/share/GeoIP/GeoIPv6.dat
+
+#################################
+# geoip-dnssec-keydir	Directory to hold dnssec keys (also turns DNSSEC on)
+#
+# geoip-dnssec-keydir=
+
+#################################
+# geoip-zones-file	YAML file to load zone(s) configuration
+#
+# geoip-zones-file=
+
+#################################
+# gmysql-activate-domain-key-query	
+#
+# gmysql-activate-domain-key-query=update cryptokeys set active=1 where domain_id=(select id from domains where name='%s') and  cryptokeys.id=%d
+
+#################################
+# gmysql-add-domain-key-query	
+#
+# gmysql-add-domain-key-query=insert into cryptokeys (domain_id, flags, active, content) select id, %d, %d, '%s' from domains where name='%s'
+
+#################################
+# gmysql-any-id-query	Any with ID query
+#
+# gmysql-any-id-query=SELECT content,ttl,prio,type,domain_id,disabled,name,auth FROM records WHERE disabled=0 and name='%s' and domain_id=%d
+
+#################################
+# gmysql-any-query	Any query
+#
+# gmysql-any-query=SELECT content,ttl,prio,type,domain_id,disabled,name,auth FROM records WHERE disabled=0 and name='%s'
+
+#################################
+# gmysql-basic-query	Basic query
+#
+# gmysql-basic-query=SELECT content,ttl,prio,type,domain_id,disabled,name,auth FROM records WHERE disabled=0 and type='%s' and name='%s'
+
+#################################
+# gmysql-clear-domain-all-keys-query	
+#
+# gmysql-clear-domain-all-keys-query=delete from cryptokeys where domain_id=(select id from domains where name='%s')
+
+#################################
+# gmysql-clear-domain-all-metadata-query	
+#
+# gmysql-clear-domain-all-metadata-query=delete from domainmetadata where domain_id=(select id from domains where name='%s')
+
+#################################
+# gmysql-clear-domain-metadata-query	
+#
+# gmysql-clear-domain-metadata-query=delete from domainmetadata where domain_id=(select id from domains where name='%s') and domainmetadata.kind='%s'
+
+#################################
+# gmysql-dbname	Pdns backend database name to connect to
+#
+# gmysql-dbname=powerdns
+
+#################################
+# gmysql-deactivate-domain-key-query	
+#
+# gmysql-deactivate-domain-key-query=update cryptokeys set active=0 where domain_id=(select id from domains where name='%s') and  cryptokeys.id=%d
+
+#################################
+# gmysql-delete-comment-rrset-query	
+#
+# gmysql-delete-comment-rrset-query=DELETE FROM comments WHERE domain_id=%d AND name='%s' AND type='%s'
+
+#################################
+# gmysql-delete-comments-query	
+#
+# gmysql-delete-comments-query=DELETE FROM comments WHERE domain_id=%d
+
+#################################
+# gmysql-delete-domain-query	
+#
+# gmysql-delete-domain-query=delete from domains where name='%s'
+
+#################################
+# gmysql-delete-empty-non-terminal-query	delete empty non-terminal from zone
+#
+# gmysql-delete-empty-non-terminal-query=delete from records where domain_id='%d' and name='%s' and type is null
+
+#################################
+# gmysql-delete-names-query	
+#
+# gmysql-delete-names-query=delete from records where domain_id = %d and name='%s'
+
+#################################
+# gmysql-delete-rrset-query	
+#
+# gmysql-delete-rrset-query=delete from records where domain_id=%d and name='%s' and type='%s'
+
+#################################
+# gmysql-delete-tsig-key-query	
+#
+# gmysql-delete-tsig-key-query=delete from tsigkeys where name='%s'
+
+#################################
+# gmysql-delete-zone-query	
+#
+# gmysql-delete-zone-query=delete from records where domain_id=%d
+
+#################################
+# gmysql-dnssec	Enable DNSSEC processing
+#
+# gmysql-dnssec=no
+
+#################################
+# gmysql-get-all-domain-metadata-query	
+#
+# gmysql-get-all-domain-metadata-query=select kind,content from domains, domainmetadata where domainmetadata.domain_id=domains.id and name='%s'
+
+#################################
+# gmysql-get-all-domains-query	Retrieve all domains
+#
+# gmysql-get-all-domains-query=select domains.id, domains.name, records.content, domains.type, domains.master, domains.notified_serial, domains.last_check from domains LEFT JOIN records ON records.domain_id=domains.id AND records.type='SOA' AND records.name=domains.name WHERE records.disabled=0 OR %d
+
+#################################
+# gmysql-get-domain-metadata-query	
+#
+# gmysql-get-domain-metadata-query=select content from domains, domainmetadata where domainmetadata.domain_id=domains.id and name='%s' and domainmetadata.kind='%s'
+
+#################################
+# gmysql-get-order-after-query	DNSSEC Ordering Query, after
+#
+# gmysql-get-order-after-query=select min(ordername) from records where ordername > '%s' and domain_id=%d and disabled=0 and ordername is not null
+
+#################################
+# gmysql-get-order-before-query	DNSSEC Ordering Query, before
+#
+# gmysql-get-order-before-query=select ordername, name from records where ordername <= '%s' and domain_id=%d and disabled=0 and ordername is not null order by 1 desc limit 1
+
+#################################
+# gmysql-get-order-first-query	DNSSEC Ordering Query, first
+#
+# gmysql-get-order-first-query=select ordername, name from records where domain_id=%d and disabled=0 and ordername is not null order by 1 asc limit 1
+
+#################################
+# gmysql-get-order-last-query	DNSSEC Ordering Query, last
+#
+# gmysql-get-order-last-query=select ordername, name from records where ordername != '' and domain_id=%d and disabled=0 and ordername is not null order by 1 desc limit 1
+
+#################################
+# gmysql-get-tsig-key-query	
+#
+# gmysql-get-tsig-key-query=select algorithm, secret from tsigkeys where name='%s'
+
+#################################
+# gmysql-get-tsig-keys-query	
+#
+# gmysql-get-tsig-keys-query=select name,algorithm, secret from tsigkeys
+
+#################################
+# gmysql-group	Pdns backend MySQL 'group' to connect as
+#
+# gmysql-group=client
+
+#################################
+# gmysql-host	Database backend host to connect to
+#
+# gmysql-host=
+
+#################################
+# gmysql-id-query	Basic with ID query
+#
+# gmysql-id-query=SELECT content,ttl,prio,type,domain_id,disabled,name,auth FROM records WHERE disabled=0 and type='%s' and name='%s' and domain_id=%d
+
+#################################
+# gmysql-info-all-master-query	
+#
+# gmysql-info-all-master-query=select id,name,master,last_check,notified_serial,type from domains where type='MASTER'
+
+#################################
+# gmysql-info-all-slaves-query	
+#
+# gmysql-info-all-slaves-query=select id,name,master,last_check,type from domains where type='SLAVE'
+
+#################################
+# gmysql-info-zone-query	
+#
+# gmysql-info-zone-query=select id,name,master,last_check,notified_serial,type from domains where name='%s'
+
+#################################
+# gmysql-innodb-read-committed	Use InnoDB READ-COMMITTED transaction isolation level
+#
+# gmysql-innodb-read-committed=yes
+
+#################################
+# gmysql-insert-comment-query	
+#
+# gmysql-insert-comment-query=INSERT INTO comments (domain_id, name, type, modified_at, account, comment) VALUES (%d, '%s', '%s', %d, '%s', '%s')
+
+#################################
+# gmysql-insert-empty-non-terminal-query	insert empty non-terminal in zone
+#
+# gmysql-insert-empty-non-terminal-query=insert into records (domain_id,name,type,disabled,auth) values ('%d','%s',null,0,'1')
+
+#################################
+# gmysql-insert-ent-order-query	insert empty non-terminal in zone
+#
+# gmysql-insert-ent-order-query=insert into records (type,domain_id,disabled,name,ordername,auth) values (null,'%d',0,'%s','%s','%d')
+
+#################################
+# gmysql-insert-ent-query	insert empty non-terminal in zone
+#
+# gmysql-insert-ent-query=insert into records (type,domain_id,disabled,name,auth) values (null,'%d',0,'%s','%d')
+
+#################################
+# gmysql-insert-record-order-query	
+#
+# gmysql-insert-record-order-query=insert into records (content,ttl,prio,type,domain_id,disabled,name,ordername,auth) values ('%s',%d,%d,'%s',%d,%d,'%s','%s','%d')
+
+#################################
+# gmysql-insert-record-query	
+#
+# gmysql-insert-record-query=insert into records (content,ttl,prio,type,domain_id,disabled,name,auth) values ('%s',%d,%d,'%s',%d,%d,'%s','%d')
+
+#################################
+# gmysql-insert-slave-query	
+#
+# gmysql-insert-slave-query=insert into domains (type,name,master,account) values('SLAVE','%s','%s','%s')
+
+#################################
+# gmysql-insert-zone-query	
+#
+# gmysql-insert-zone-query=insert into domains (type,name) values('NATIVE','%s')
+
+#################################
+# gmysql-list-comments-query	
+#
+# gmysql-list-comments-query=SELECT domain_id,name,type,modified_at,account,comment FROM comments WHERE domain_id=%d
+
+#################################
+# gmysql-list-domain-keys-query	
+#
+# gmysql-list-domain-keys-query=select cryptokeys.id, flags, active, content from domains, cryptokeys where cryptokeys.domain_id=domains.id and name='%s'
+
+#################################
+# gmysql-list-query	AXFR query
+#
+# gmysql-list-query=SELECT content,ttl,prio,type,domain_id,disabled,name,auth FROM records WHERE (disabled=0 OR %d) and domain_id='%d' order by name, type
+
+#################################
+# gmysql-list-subzone-query	Subzone listing
+#
+# gmysql-list-subzone-query=SELECT content,ttl,prio,type,domain_id,disabled,name,auth FROM records WHERE disabled=0 and (name='%s' OR name like '%s') and domain_id='%d'
+
+#################################
+# gmysql-master-zone-query	Data
+#
+# gmysql-master-zone-query=select master from domains where name='%s' and type='SLAVE'
+
+#################################
+# gmysql-nullify-ordername-and-auth-query	DNSSEC nullify ordername and auth query
+#
+# gmysql-nullify-ordername-and-auth-query=update records set ordername=NULL,auth=0 where name='%s' and type='%s' and domain_id='%d' and disabled=0
+
+#################################
+# gmysql-nullify-ordername-and-update-auth-query	DNSSEC nullify ordername and update auth query
+#
+# gmysql-nullify-ordername-and-update-auth-query=update records set ordername=NULL,auth=%d where domain_id='%d' and name='%s' and disabled=0
+
+#################################
+# gmysql-password	Pdns backend password to connect with
+#
+# gmysql-password=
+
+#################################
+# gmysql-port	Database backend port to connect to
+#
+# gmysql-port=0
+
+#################################
+# gmysql-remove-domain-key-query	
+#
+# gmysql-remove-domain-key-query=delete from cryptokeys where domain_id=(select id from domains where name='%s') and cryptokeys.id=%d
+
+#################################
+# gmysql-remove-empty-non-terminals-from-zone-query	remove all empty non-terminals from zone
+#
+# gmysql-remove-empty-non-terminals-from-zone-query=delete from records where domain_id='%d' and type is null
+
+#################################
+# gmysql-set-auth-on-ds-record-query	DNSSEC set auth on a DS record
+#
+# gmysql-set-auth-on-ds-record-query=update records set auth=1 where domain_id='%d' and name='%s' and type='DS' and disabled=0
+
+#################################
+# gmysql-set-domain-metadata-query	
+#
+# gmysql-set-domain-metadata-query=insert into domainmetadata (domain_id, kind, content) select id, '%s', '%s' from domains where name='%s'
+
+#################################
+# gmysql-set-order-and-auth-query	DNSSEC set ordering query
+#
+# gmysql-set-order-and-auth-query=update records set ordername='%s',auth=%d where name='%s' and domain_id='%d' and disabled=0
+
+#################################
+# gmysql-set-tsig-key-query	
+#
+# gmysql-set-tsig-key-query=replace into tsigkeys (name,algorithm,secret) values('%s','%s','%s')
+
+#################################
+# gmysql-socket	Pdns backend socket to connect to
+#
+# gmysql-socket=
+
+#################################
+# gmysql-supermaster-name-to-ips	
+#
+# gmysql-supermaster-name-to-ips=select ip,account from supermasters where nameserver='%s' and account='%s'
+
+#################################
+# gmysql-supermaster-query	
+#
+# gmysql-supermaster-query=select account from supermasters where ip='%s' and nameserver='%s'
+
+#################################
+# gmysql-update-kind-query	
+#
+# gmysql-update-kind-query=update domains set type='%s' where name='%s'
+
+#################################
+# gmysql-update-lastcheck-query	
+#
+# gmysql-update-lastcheck-query=update domains set last_check=%d where id=%d
+
+#################################
+# gmysql-update-master-query	
+#
+# gmysql-update-master-query=update domains set master='%s' where name='%s'
+
+#################################
+# gmysql-update-serial-query	
+#
+# gmysql-update-serial-query=update domains set notified_serial=%d where id=%d
+
+#################################
+# gmysql-user	Database backend user to connect as
+#
+# gmysql-user=powerdns
+
+#################################
+# gmysql-zone-lastchange-query	
+#
+# gmysql-zone-lastchange-query=select max(change_date) from records where domain_id=%d
+
+#################################
+# gpgsql-activate-domain-key-query	
+#
+# gpgsql-activate-domain-key-query=update cryptokeys set active=true where domain_id=(select id from domains where name=E'%s') and  cryptokeys.id=%d
+
+#################################
+# gpgsql-add-domain-key-query	
+#
+# gpgsql-add-domain-key-query=insert into cryptokeys (domain_id, flags, active, content) select id, %d, (%d = 1), '%s' from domains where name=E'%s'
+
+#################################
+# gpgsql-any-id-query	Any with ID query
+#
+# gpgsql-any-id-query=SELECT content,ttl,prio,type,domain_id,disabled::int,name,auth::int FROM records WHERE disabled=false and name=E'%s' and domain_id=%d
+
+#################################
+# gpgsql-any-query	Any query
+#
+# gpgsql-any-query=SELECT content,ttl,prio,type,domain_id,disabled::int,name,auth::int FROM records WHERE disabled=false and name=E'%s'
+
+#################################
+# gpgsql-basic-query	Basic query
+#
+# gpgsql-basic-query=SELECT content,ttl,prio,type,domain_id,disabled::int,name,auth::int FROM records WHERE disabled=false and type='%s' and name=E'%s'
+
+#################################
+# gpgsql-clear-domain-all-keys-query	
+#
+# gpgsql-clear-domain-all-keys-query=delete from cryptokeys where domain_id=(select id from domains where name=E'%s')
+
+#################################
+# gpgsql-clear-domain-all-metadata-query	
+#
+# gpgsql-clear-domain-all-metadata-query=delete from domainmetadata where domain_id=(select id from domains where name=E'%s')
+
+#################################
+# gpgsql-clear-domain-metadata-query	
+#
+# gpgsql-clear-domain-metadata-query=delete from domainmetadata where domain_id=(select id from domains where name=E'%s') and domainmetadata.kind=E'%s'
+
+#################################
+# gpgsql-dbname	Pdns backend database name to connect to
+#
+# gpgsql-dbname=
+
+#################################
+# gpgsql-deactivate-domain-key-query	
+#
+# gpgsql-deactivate-domain-key-query=update cryptokeys set active=false where domain_id=(select id from domains where name=E'%s') and  cryptokeys.id=%d
+
+#################################
+# gpgsql-delete-comment-rrset-query	
+#
+# gpgsql-delete-comment-rrset-query=DELETE FROM comments WHERE domain_id=%d AND name=E'%s' AND type=E'%s'
+
+#################################
+# gpgsql-delete-comments-query	
+#
+# gpgsql-delete-comments-query=DELETE FROM comments WHERE domain_id=%d
+
+#################################
+# gpgsql-delete-domain-query	
+#
+# gpgsql-delete-domain-query=delete from domains where name=E'%s'
+
+#################################
+# gpgsql-delete-empty-non-terminal-query	delete empty non-terminal from zone
+#
+# gpgsql-delete-empty-non-terminal-query=delete from records where domain_id='%d' and name='%s' and type is null
+
+#################################
+# gpgsql-delete-names-query	
+#
+# gpgsql-delete-names-query=delete from records where domain_id=%d and name=E'%s'
+
+#################################
+# gpgsql-delete-rrset-query	
+#
+# gpgsql-delete-rrset-query=delete from records where domain_id=%d and name=E'%s' and type=E'%s'

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410172008.s9HK8W69045404>