From ea367571f09d1420bd96380f3ce7dcedf8aaf879 Mon Sep 17 00:00:00 2001 From: Pieter Lexis Date: Mon, 7 Sep 2015 10:52:19 +0200 Subject: [PATCH] Fix the installation of the auth deb package The post-install script expects the main config to be in /usr/share/pdns-server and fails if it isn't there. --- build-scripts/debian-authoritative/rules | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/build-scripts/debian-authoritative/rules b/build-scripts/debian-authoritative/rules index 74625af98..38cd339c0 100755 --- a/build-scripts/debian-authoritative/rules +++ b/build-scripts/debian-authoritative/rules @@ -43,15 +43,6 @@ override_dh_fixperms: chmod 755 debian/pdns-server/etc/resolvconf/update.d/pdns override_dh_auto_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!' \ - -e 's!# launch=.*!&\nlaunch=!' \ - -e 's!# setgid=.*!setgid=pdns!' \ - -e 's!# setuid=.*!setuid=pdns!' \ - > debian/pdns-server/etc/powerdns/pdns.conf dh_auto_install rm -f debian/pdns-server/etc/powerdns/pdns.conf-dist @@ -61,6 +52,18 @@ override_dh_installinit: dh_installinit --name=pdns dh_systemd_start --restart-after-upgrade +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!' \ + -e 's!# launch=.*!&\nlaunch=!' \ + -e 's!# setgid=.*!setgid=pdns!' \ + -e 's!# setuid=.*!setuid=pdns!' \ + > debian/pdns-server/usr/share/pdns-server/pdns.conf + # Verbose build (shows used compiler/linker and their flags) override_dh_auto_build-arch: dh_auto_build -- V=1 -- 2.40.0