Revert "Merge master into staging-next"

I merged master into staging-next but accidentally pushed it to master. This should get us back to 87a19e9048. This reverts commit ac241fb7a5, reversing changes made to 76a439239e.
2020-02-05 19:18:35 +01:00
parent ac241fb7a5
commit 0be87c7979
28 changed files with 422 additions and 297 deletions
@@ -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;