summaryrefslogtreecommitdiffstats
path: root/nixos/modules/misc
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2020-02-05 19:18:11 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2020-02-05 19:18:35 +0100
commit0be87c79797a5fa384fbc356c74ed54f9f7829ea (patch)
tree69e2f87d4a1ec8f8962d35e330188afcf8f88dcb /nixos/modules/misc
parentac241fb7a570d6cf81d229ad22a8889602639160 (diff)
Revert "Merge master into staging-next"
I merged master into staging-next but accidentally pushed it to master. This should get us back to 87a19e9048773d5a363679617406ad148d36c3b8. This reverts commit ac241fb7a570d6cf81d229ad22a8889602639160, reversing changes made to 76a439239eb310d9ad76d998b34d5d3bc0e37acb.
Diffstat (limited to 'nixos/modules/misc')
-rw-r--r--nixos/modules/misc/ids.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 979cdc5d4ad4..bedd87a368eb 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -299,7 +299,7 @@ in
couchpotato = 267;
gogs = 268;
pdns-recursor = 269;
- #kresd = 270; # switched to "knot-resolver" with dynamic ID
+ kresd = 270;
rpc = 271;
geoip = 272;
fcron = 273;
@@ -600,7 +600,7 @@ in
headphones = 266;
couchpotato = 267;
gogs = 268;
- #kresd = 270; # switched to "knot-resolver" with dynamic ID
+ kresd = 270;
#rpc = 271; # unused
#geoip = 272; # unused
fcron = 273;