[pdns] Disable pdns guardian by default (rhbz#883852)
Morten Stevens
mstevens at fedoraproject.org
Mon Jan 7 15:30:36 UTC 2013
commit 5d439e7f0a5636a459a281a3c092456f89eca879
Author: Morten Stevens <mstevens at imt-systems.com>
Date: Mon Jan 7 16:30:10 2013 +0100
Disable pdns guardian by default (rhbz#883852)
pdns-mongodb-fix1.patch | 15 ---------------
pdns-mongodb-fix2.patch | 18 ------------------
pdns.service | 5 +++--
pdns.spec | 41 +++++++----------------------------------
4 files changed, 10 insertions(+), 69 deletions(-)
---
diff --git a/pdns.service b/pdns.service
index 1b826d9..6edf2ae 100644
--- a/pdns.service
+++ b/pdns.service
@@ -4,9 +4,10 @@ After=network.target
[Service]
Type=forking
-ExecStart=/usr/sbin/pdns_server --daemon --guardian=yes
-ExecReload=/usr/bin/pdns_control cycle
+ExecStart=/usr/sbin/pdns_server --daemon
ExecStop=/usr/bin/pdns_control quit
+Restart=on-failure
+RestartSec=2
[Install]
WantedBy=multi-user.target
diff --git a/pdns.spec b/pdns.spec
index aae5373..29c7ea7 100644
--- a/pdns.spec
+++ b/pdns.spec
@@ -3,19 +3,14 @@
Summary: A modern, advanced and high performance authoritative-only nameserver
Name: pdns
Version: 3.1
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL: http://powerdns.com
Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz
Source1: pdns.service
-
-# Patches
-
Patch0: pdns-default-config.patch
-Patch1: pdns-mongodb-fix1.patch
-Patch2: pdns-mongodb-fix2.patch
-Patch3: pdns-return-exit0.patch
+Patch1: pdns-return-exit0.patch
Requires(pre): shadow-utils
Requires(post): systemd-sysv
@@ -76,15 +71,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
BuildRequires: sqlite-devel
%global backends %{backends} gsqlite3
-%ifarch %{ix86} x86_64
-%package backend-mongodb
-Summary: MongoDB backend for %{name}
-Group: System Environment/Daemons
-Requires: %{name}%{?_isa} = %{version}-%{release}
-BuildRequires: mongodb-devel
-%global backends %{backends} mongodb
-%endif
-
%description backend-mysql
This package contains the gmysql backend for %{name}
@@ -105,18 +91,10 @@ This package contains the ldap backend for %{name}
%description backend-sqlite
This package contains the SQLite backend for %{name}
-%ifarch %{ix86} x86_64
-%description backend-mongodb
-This package contains the MongoDB backend for %{name}
-%endif
-
-
%prep
%setup -q
%patch0 -p1 -b .default-config-patch
-%patch1 -p1 -b .fixmongodb1
-%patch2 -p1 -b .fixmongodb2
-%patch3 -p1 -b .return-exit0
+%patch1 -p1 -b .return-exit0
%build
export CPPFLAGS="-DLDAP_DEPRECATED %{optflags}"
@@ -153,7 +131,6 @@ chrpath --delete %{buildroot}%{_libdir}/%{name}/*.so
# Copy systemd service file
install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/pdns.service
-
%pre
getent group pdns >/dev/null || groupadd -r pdns
getent passwd pdns >/dev/null || \
@@ -180,7 +157,6 @@ exit 0
/sbin/chkconfig --del pdns &>/dev/null || :
/bin/systemctl try-restart pdns.service &>/dev/null || :
-
%files
%defattr(-,root,root,-)
%doc COPYING README
@@ -230,14 +206,11 @@ exit 0
%doc pdns/no-dnssec.schema.sqlite3.sql
%doc pdns/bind-dnssec.schema.sqlite3.sql
-%ifarch %{ix86} x86_64
-%files backend-mongodb
-%defattr(-,root,root,-)
-%{_libdir}/%{name}/libmongodbbackend.so
-%endif
-
-
%changelog
+* Mon Jan 07 2013 Morten Stevens <mstevens at imt-systems.com> - 3.1-7
+- Disable pdns guardian by default (rhbz#883852)
+- Drop backend MongoDB as it does not work (upstream commit 3017)
+
* Thu Nov 22 2012 Ruben Kerkhof <ruben at rubenkerkhof.com> - 3.1-6
- Add example schemas to documentation
More information about the scm-commits
mailing list