nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 10:23:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

pdns: Changed paths in /etc to use pdns instead of powerdns

Browse Source
This commit is contained in:
TQ Hirsch 2023-06-29 12:42:01 +02:00 committed by Nick Cao
parent 8ab22ad2ad
commit dd481f2ee3
No known key found for this signature in database
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/networking/pdns-recursor.nix
View File

@ -159,7 +159,7 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.etc."powerdns-recursor".source = configDir; environment.etc."pdns-recursor".source = configDir;
services.pdns-recursor.settings = mkDefaultAttrs { services.pdns-recursor.settings = mkDefaultAttrs {
local-address = cfg.dns.address; local-address = cfg.dns.address;

2
nixos/modules/services/networking/powerdns.nix
View File

@ -38,7 +38,7 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.etc.powerdns.source = finalConfigDir; environment.etc.pdns.source = finalConfigDir;
systemd.packages = [ pkgs.pdns ]; systemd.packages = [ pkgs.pdns ];

4
pkgs/servers/dns/pdns-recursor/default.nix
View File

@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--enable-reproducible" "--enable-reproducible"
"--enable-systemd" "--enable-systemd"
"sysconfdir=/etc/powerdns-recursor" "sysconfdir=/etc/pdns-recursor"
]; ];
installFlags = [ "sysconfdir=$(out)/etc/powerdns-recursor" ]; installFlags = [ "sysconfdir=$(out)/etc/pdns-recursor" ];
enableParallelBuilding = true; enableParallelBuilding = true;

6
pkgs/servers/dns/pdns/default.nix
View File

@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
"--with-libsodium" "--with-libsodium"
"--with-sqlite3" "--with-sqlite3"
"--with-libcrypto=${openssl.dev}" "--with-libcrypto=${openssl.dev}"
"sysconfdir=/etc/powerdns" "sysconfdir=/etc/pdns"
]; ];
# nix destroy with-modules arguments, when using configureFlags # 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 # 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 # $out
installFlags = [ "sysconfdir=$(out)/etc/powerdns" ]; installFlags = [ "sysconfdir=$(out)/etc/pdns" ];
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = true; doCheck = true;