From 8e677878ecf9f724bc4060be68a67c5673da975b Mon Sep 17 00:00:00 2001 From: Christian Hofstaedtler Date: Fri, 13 May 2016 18:45:14 +0200 Subject: [PATCH] build scripts: Stop patching config-dir in pdns.conf By the time this is read, it is too late anyway. --- build-scripts/build-auth-rpm | 2 -- build-scripts/debian-authoritative/rules | 1 - 2 files changed, 3 deletions(-) diff --git a/build-scripts/build-auth-rpm b/build-scripts/build-auth-rpm index 8354d4f93e..c8b73998af 100755 --- a/build-scripts/build-auth-rpm +++ b/build-scripts/build-auth-rpm @@ -449,7 +449,6 @@ make install DESTDIR=%{buildroot} %{__rm} -f %{buildroot}%{_libdir}/%{name}/*.la %{__rm} -rf %{buildroot}%{_docdir} %{buildroot}/usr/sbin/pdns_server --no-config --config | sed \ - -e 's!# config-dir=.*!config-dir=%{_sysconfdir}%{name}!' \ -e 's!# daemon=.*!daemon=no!' \ -e 's!# guardian=.*!guardian=no!' \ -e 's!# launch=.*!&\\nlaunch=!' \ @@ -705,7 +704,6 @@ make install DESTDIR=%{buildroot} %{__rm} -f %{buildroot}%{_libdir}/%{name}/*.la %{__rm} -rf %{buildroot}/usr/share/doc %{buildroot}/usr/sbin/pdns_server --no-config --config | sed \ - -e 's!# config-dir=.*!config-dir=%{_sysconfdir}%{name}!' \ -e 's!# daemon=.*!daemon=yes!' \ -e 's!# guardian=.*!guardian=yes!' \ -e 's!# launch=.*!&\\nlaunch=!' \ diff --git a/build-scripts/debian-authoritative/rules b/build-scripts/debian-authoritative/rules index 9b3d8b4ca1..808ed45a3a 100755 --- a/build-scripts/debian-authoritative/rules +++ b/build-scripts/debian-authoritative/rules @@ -74,7 +74,6 @@ override_dh_installinit: override_dh_install: dh_install ./pdns/pdns_server --no-config --config | sed \ - -e 's!# config-dir=.*!config-dir=/etc/powerdns!' \ -e 's!# daemon=.*!daemon=yes!' \ -e 's!# guardian=.*!guardian=yes!' \ -e 's!# include-dir=.*!&\ninclude-dir=/etc/powerdns/pdns.d!' \ -- 2.47.2