mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 03:23:29 +03:00
374e6bcc40
Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:
nix-build ci -A fmt.check
This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).
This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).
Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase).
If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.
97 lines
2 KiB
Nix
97 lines
2 KiB
Nix
{
|
|
config,
|
|
pkgs,
|
|
lib,
|
|
...
|
|
}:
|
|
|
|
with lib;
|
|
|
|
let
|
|
|
|
cfg = config.services.sniproxy;
|
|
|
|
configFile = pkgs.writeText "sniproxy.conf" ''
|
|
user ${cfg.user}
|
|
pidfile /run/sniproxy.pid
|
|
${cfg.config}
|
|
'';
|
|
|
|
in
|
|
{
|
|
imports = [
|
|
(mkRemovedOptionModule [ "services" "sniproxy" "logDir" ]
|
|
"Now done by LogsDirectory=. Set to a custom path if you log to a different folder in your config."
|
|
)
|
|
];
|
|
|
|
options = {
|
|
services.sniproxy = {
|
|
enable = mkEnableOption "sniproxy server";
|
|
|
|
user = mkOption {
|
|
type = types.str;
|
|
default = "sniproxy";
|
|
description = "User account under which sniproxy runs.";
|
|
};
|
|
|
|
group = mkOption {
|
|
type = types.str;
|
|
default = "sniproxy";
|
|
description = "Group under which sniproxy runs.";
|
|
};
|
|
|
|
config = mkOption {
|
|
type = types.lines;
|
|
default = "";
|
|
description = "sniproxy.conf configuration excluding the daemon username and pid file.";
|
|
example = ''
|
|
error_log {
|
|
filename /var/log/sniproxy/error.log
|
|
}
|
|
access_log {
|
|
filename /var/log/sniproxy/access.log
|
|
}
|
|
listen 443 {
|
|
proto tls
|
|
}
|
|
table {
|
|
example.com 192.0.2.10
|
|
example.net 192.0.2.20
|
|
}
|
|
'';
|
|
};
|
|
};
|
|
|
|
};
|
|
|
|
config = mkIf cfg.enable {
|
|
systemd.services.sniproxy = {
|
|
description = "sniproxy server";
|
|
after = [ "network.target" ];
|
|
wantedBy = [ "multi-user.target" ];
|
|
|
|
serviceConfig = {
|
|
Type = "forking";
|
|
ExecStart = "${pkgs.sniproxy}/bin/sniproxy -c ${configFile}";
|
|
LogsDirectory = "sniproxy";
|
|
LogsDirectoryMode = "0640";
|
|
Restart = "always";
|
|
};
|
|
};
|
|
|
|
users.users = mkIf (cfg.user == "sniproxy") {
|
|
sniproxy = {
|
|
group = cfg.group;
|
|
uid = config.ids.uids.sniproxy;
|
|
};
|
|
};
|
|
|
|
users.groups = mkIf (cfg.group == "sniproxy") {
|
|
sniproxy = {
|
|
gid = config.ids.gids.sniproxy;
|
|
};
|
|
};
|
|
|
|
};
|
|
}
|