Merge branch 'master' into staging-next

There are several thousand rebuilds from master already.
Hydra nixpkgs: ?compare=1528940

nixos/modules/services/misc/lidarr.nix

@@ -16,6 +16,30 @@ in
         defaultText = "pkgs.lidarr";
         description = "The Lidarr package to use";
       };
+
+      openFirewall = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Open ports in the firewall for Lidarr
+        '';
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "lidarr";
+        description = ''
+          User account under which Lidarr runs.
+        '';
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "lidarr";
+        description = ''
+          Group under which Lidarr runs.
+        '';
+      };
     };
   };
 
@@ -27,8 +51,8 @@ in
 
       serviceConfig = {
         Type = "simple";
-        User = "lidarr";
-        Group = "lidarr";
+        User = cfg.user;
+        Group = cfg.group;
         ExecStart = "${cfg.package}/bin/Lidarr";
         Restart = "on-failure";
 
@@ -37,12 +61,21 @@ in
       };
     };
 
-    users.users.lidarr = {
-      uid = config.ids.uids.lidarr;
-      home = "/var/lib/lidarr";
-      group = "lidarr";
+    networking.firewall = mkIf cfg.openFirewall {
+      allowedTCPPorts = [ 8686 ];
     };
 
-    users.groups.lidarr.gid = config.ids.gids.lidarr;
+    users.users = mkIf (cfg.user == "lidarr") {
+      lidarr = {
+        group = cfg.group;
+        uid = config.ids.uids.lidarr;
+      };
+    };
+
+    users.groups = mkIf (cfg.group == "lidarr") {
+      lidarr = {
+        gid = config.ids.gids.lidarr;
+      };
+    };
   };
 }

nixos/modules/services/misc/zoneminder.nix

@@ -19,7 +19,7 @@ let
 
   useCustomDir = cfg.storageDir != null;
 
-  socket = "/run/phpfpm-zoneminder/zoneminder.sock";
+  socket = "/run/phpfpm/${dirName}.sock";
 
   zms = "/cgi-bin/zms";
 
@@ -284,10 +284,7 @@ in {
 
       phpfpm = lib.mkIf useNginx {
         pools.zoneminder = {
-          socketName = "zoneminder";
-          phpPackage = pkgs.php;
-          user = "${user}";
-          group = "${group}";
+          listen = socket;
           phpOptions = ''
             date.timezone = "${config.time.timeZone}"
 
@@ -295,6 +292,9 @@ in {
             "extension=${e.pkg}/lib/php/extensions/${e.name}.so") phpExtensions)}
           '';
           extraConfig = ''
+            user = ${user}
+            group = ${group}
+
             listen.owner = ${user}
             listen.group = ${group}
             listen.mode = 0660