Unverified Commit 74cde83a authored by Yifei Sun's avatar Yifei Sun Committed by GitHub
Browse files

nixos/{karma,pgbouncer}: use cfg.package instead of global pkgs (#412435)

parents dd27ec58 8eed004f

nixos/modules/services/databases/pgbouncer.nix

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ in 
        User = cfg.user;

        Group = cfg.group;

        ExecStart = utils.escapeSystemdExecArgs [

          (lib.getExe pkgs.pgbouncer)

          (lib.getExe cfg.package)

          "/etc/${configPath}"

        ];

        RuntimeDirectory = "pgbouncer";

nixos/modules/services/monitoring/karma.nix

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ in 
        Type = "simple";

        DynamicUser = true;

        Restart = "on-failure";

        ExecStart = "${pkgs.karma}/bin/karma --config.file ${cfg.configFile} ${lib.concatStringsSep " " cfg.extraOptions}";

        ExecStart = "${lib.getExe cfg.package} --config.file ${cfg.configFile} ${lib.concatStringsSep " " cfg.extraOptions}";

      };

    };

    networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.settings.listen.port ];