commit fc6c869de01795773c7908d2bd25522b6f28668a
Author: Tomasz Rutkowski <[email protected]>
Date: Wed Jul 16 17:21:01 2014 +0200
- up to 3.6.0
- use auto-generated default config
pdns-recursor.conf | 210 -----------------------------------------------------
pdns-recursor.spec | 22 +++---
2 files changed, 12 insertions(+), 220 deletions(-)
---
diff --git a/pdns-recursor.spec b/pdns-recursor.spec
index 089da8f..c07e669 100644
--- a/pdns-recursor.spec
+++ b/pdns-recursor.spec
@@ -1,14 +1,13 @@
Summary: Modern, advanced and high performance recursing/non
authoritative nameserver
-Summary(pl.UTF-8): Nowoczesny i zaawansowany buforujący serwer DNS o
wysokiej wudajności
+Summary(pl.UTF-8): Nowoczesny i zaawansowany buforujący serwer DNS o
wysokiej wydajności
Name: pdns-recursor
-Version: 3.3
+Version: 3.6.0
Release: 1
License: GPL
Group: Networking/Daemons
Source0:
http://downloads.powerdns.com/releases/%{name}-%{version}.tar.bz2
-# Source0-md5: 87daeeebb6f7af9e07814ff6c43300dd
+# Source0-md5: 95f21e6d64c1332aeca9fa3f786dd0a2
Source1: %{name}.init
-Source2: %{name}.conf
URL: http://www.powerdns.com/
BuildRequires: boost-devel
Requires(post): sed >= 4.0
@@ -40,7 +39,7 @@ PowerDNS Recursor jest wysokowydajnym buforującym serwerem
DNS.
%{__make} \
BINDIR="%{_bindir}" \
SBINDIR="%{_sbindir}" \
- CONFIGDIR="%{_sysconfdir}/%{name}" \
+ SYSCONFDIR="%{_sysconfdir}/%{name}" \
CC="%{__cc}" \
CXX="%{__cxx}" \
OPTFLAGS="%{rpmcxxflags}" \
@@ -52,15 +51,17 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
BINDIR="%{_bindir}" \
SBINDIR="%{_sbindir}" \
- CONFIGDIR="%{_sysconfdir}/%{name}" \
+ SYSCONFDIR="%{_sysconfdir}/%{name}" \
DESTDIR=$RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/init.d
install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/init.d
-
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/recursor.conf-dist
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/recursor.conf
+install -d $RPM_BUILD_ROOT%{systemdunitdir}
+install contrib/systemd-pdns-recursor.service
$RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
+mv $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/recursor.conf-dist
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/recursor.conf
+sed -i 's/^# setgid=$/setgid=djbdns/g'
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/recursor.conf
+sed -i 's/^# setuid=$/setuid=pdns-recursor/g'
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/recursor.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -89,6 +90,7 @@ fi
%defattr(644,root,root,755)
%doc README
%attr(754,root,root) /etc/rc.d/init.d/%{name}
+%attr(644,root,root) %{systemdunitdir}/%{name}.service
%dir %{_sysconfdir}/%{name}
%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}/recursor.conf
%attr(755,root,root) %{_sbindir}/*
diff --git a/pdns-recursor.conf b/pdns-recursor.conf
deleted file mode 100644
index 9aa7e94..0000000
--- a/pdns-recursor.conf
+++ /dev/null
@@ -1,210 +0,0 @@
-# Autogenerated configuration file template
-#################################
-# aaaa-additional-processing turn on to do AAAA additional processing (slow)
-#
-# aaaa-additional-processing=off
-
-#################################
-# allow-from If set, only allow these comma separated netmasks to recurse
-#
-# allow-from=127.0.0.0/8, 10.0.0.0/8, 192.168.0.0/16, 172.16.0.0/12, ::1/128,
fe80::/10
-
-#################################
-# allow-from-file If set, load allowed netmasks from this file
-#
-# allow-from-file=
-
-#################################
-# auth-can-lower-ttl If we follow RFC 2181 to the letter, an authoritative
server can lower the TTL of NS records
-#
-# auth-can-lower-ttl=off
-
-#################################
-# auth-zones Zones for which we have authoritative data, comma separated
domain=file pairs
-#
-# auth-zones=
-
-#################################
-# chroot switch to chroot jail
-#
-# chroot=
-
-#################################
-# client-tcp-timeout Timeout in seconds when talking to TCP clients
-#
-# client-tcp-timeout=2
-
-#################################
-# config-dir Location of configuration directory (recursor.conf)
-#
-config-dir=/etc/pdns-recursor/
-
-#################################
-# delegation-only Which domains we only accept delegations from
-#
-# delegation-only=
-
-#################################
-# dont-query If set, do not query these netmasks for DNS data
-#
-# dont-query=127.0.0.0/8, 10.0.0.0/8, 192.168.0.0/16, 172.16.0.0/12, ::1/128,
fe80::/10
-
-#################################
-# entropy-source If set, read entropy from this file
-#
-# entropy-source=/dev/urandom
-
-#################################
-# export-etc-hosts If we should serve up contents from /etc/hosts
-#
-# export-etc-hosts=off
-
-#################################
-# fork If set, fork the daemon for possible double performance
-#
-# fork=no
-
-#################################
-# forward-zones Zones for which we forward queries, comma separated
domain=ip pairs
-#
-# forward-zones=
-
-#################################
-# forward-zones-file File with domain=ip pairs for forwarding
-#
-# forward-zones-file=
-
-#################################
-# hint-file If set, load root hints from this file
-#
-# hint-file=
-
-#################################
-# ignore-rd-bit Assume each packet requires recursion, for compatability
-#
-# ignore-rd-bit=off
-
-#################################
-# local-address IP addresses to listen on, separated by spaces or
commas. Also accepts ports.
-#
-# local-address=127.0.0.1
-
-#################################
-# local-port port to listen on
-#
-# local-port=53
-
-#################################
-# log-common-errors If we should log rather common errors
-#
-# log-common-errors=yes
-
-#################################
-# logging-facility Facility to log messages as. 0 corresponds to local0
-#
-# logging-facility=
-
-#################################
-# lua-dns-script Filename containing an optional 'lua' script that will
be used to modify dns answers
-#
-# lua-dns-script=
-
-#################################
-# max-cache-entries If set, maximum number of entries in the main cache
-#
-# max-cache-entries=1000000
-
-#################################
-# max-negative-ttl maximum number of seconds to keep a negative cached
entry in memory
-#
-# max-negative-ttl=3600
-
-#################################
-# max-tcp-clients Maximum number of simultaneous TCP clients
-#
-# max-tcp-clients=128
-
-#################################
-# max-tcp-per-client If set, maximum number of TCP sessions per client (IP
address)
-#
-# max-tcp-per-client=0
-
-#################################
-# no-shuffle Don't change
-#
-# no-shuffle=off
-
-#################################
-# 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=
-
-#################################
-# remotes-ringbuffer-entries maximum number of packets to store statistics
for
-#
-# remotes-ringbuffer-entries=0
-
-#################################
-# serve-rfc1918 If we should be authoritative for RFC 1918 private IP
space
-#
-# serve-rfc1918=
-
-#################################
-# server-id Returned when queried for 'server.id' TXT, defaults to hostname
-#
-# server-id=
-
-#################################
-# setuid If set, change user id to this uid for more security
-#
-setuid=pdns-recursor
-
-#################################
-# setgid If set, change group id to this gid for more security
-#
-setgid=djbdns
-
-#################################
-# single-socket If set, only use a single socket for outgoing queries
-#
-# single-socket=off
-
-#################################
-# soa-minimum-ttl Don't change
-#
-# soa-minimum-ttl=0
-
-#################################
-# soa-serial-offset Don't change
-#
-# soa-serial-offset=0
-
-#################################
-# socket-dir Where the controlsocket will live
-#
-# socket-dir=/var/run/
-
-#################################
-# spoof-nearmiss-max If non-zero, assume spoofing after this many near misses
-#
-# spoof-nearmiss-max=20
-
-#################################
-# stack-size stack size per mthread
-#
-# stack-size=200000
-
-#################################
-# trace if we should output heaps of logging
-#
-# trace=off
-
-#################################
-# version-string string reported on version.pdns or version.bind
-#
-# version-string=PowerDNS Recursor 3.1.7.2 $Id$
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pdns-recursor.git/commitdiff/fc6c869de01795773c7908d2bd25522b6f28668a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
