mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 00:43:20 +00:00
pdns: Changed paths in /etc to use pdns instead of powerdns
This commit is contained in:
parent
8ab22ad2ad
commit
dd481f2ee3
@ -159,7 +159,7 @@ in {
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
environment.etc."powerdns-recursor".source = configDir;
|
||||
environment.etc."pdns-recursor".source = configDir;
|
||||
|
||||
services.pdns-recursor.settings = mkDefaultAttrs {
|
||||
local-address = cfg.dns.address;
|
||||
|
@ -38,7 +38,7 @@ in {
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
environment.etc.powerdns.source = finalConfigDir;
|
||||
environment.etc.pdns.source = finalConfigDir;
|
||||
|
||||
systemd.packages = [ pkgs.pdns ];
|
||||
|
||||
|
@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
|
||||
configureFlags = [
|
||||
"--enable-reproducible"
|
||||
"--enable-systemd"
|
||||
"sysconfdir=/etc/powerdns-recursor"
|
||||
"sysconfdir=/etc/pdns-recursor"
|
||||
];
|
||||
|
||||
installFlags = [ "sysconfdir=$(out)/etc/powerdns-recursor" ];
|
||||
installFlags = [ "sysconfdir=$(out)/etc/pdns-recursor" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"--with-libsodium"
|
||||
"--with-sqlite3"
|
||||
"--with-libcrypto=${openssl.dev}"
|
||||
"sysconfdir=/etc/powerdns"
|
||||
"sysconfdir=/etc/pdns"
|
||||
];
|
||||
|
||||
# nix destroy with-modules arguments, when using configureFlags
|
||||
@ -81,9 +81,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
# We want the various utilities to look for the powerdns config in
|
||||
# /etc/powerdns, but to actually install the sample config file in
|
||||
# /etc/pdns, but to actually install the sample config file in
|
||||
# $out
|
||||
installFlags = [ "sysconfdir=$(out)/etc/powerdns" ];
|
||||
installFlags = [ "sysconfdir=$(out)/etc/pdns" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
doCheck = true;
|
||||
|
Loading…
Reference in New Issue
Block a user