movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 04:35:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/pymks: log to journal

Browse source
This commit is contained in:
Peter Hoeg 2019-07-05 09:46:03 +08:00
parent 844555626a
commit 81cd220c67
2 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/rename.nix
View file

@ -66,6 +66,8 @@ with lib;
(mkRenamedOptionModule [ "services" "clamav" "updater" "config" ] [ "services" "clamav" "updater" "extraConfig" ]) (mkRenamedOptionModule [ "services" "clamav" "updater" "config" ] [ "services" "clamav" "updater" "extraConfig" ])
(mkRemovedOptionModule [ "services" "pykms" "verbose" ] "Use services.pykms.logLevel instead")
(mkRemovedOptionModule [ "security" "setuidOwners" ] "Use security.wrappers instead") (mkRemovedOptionModule [ "security" "setuidOwners" ] "Use security.wrappers instead")
(mkRemovedOptionModule [ "security" "setuidPrograms" ] "Use security.wrappers instead") (mkRemovedOptionModule [ "security" "setuidPrograms" ] "Use security.wrappers instead")

39
nixos/modules/services/misc/pykms.nix
View file

@ -4,6 +4,7 @@ with lib;
let let
cfg = config.services.pykms; cfg = config.services.pykms;
libDir = "/var/lib/pykms";
in { in {
meta.maintainers = with lib.maintainers; [ peterhoeg ]; meta.maintainers = with lib.maintainers; [ peterhoeg ];
@ -28,12 +29,6 @@ in {
description = "The port on which to listen."; description = "The port on which to listen.";
}; };
verbose = mkOption {
type = types.bool;
default = false;
description = "Show verbose output.";
};
openFirewallPort = mkOption { openFirewallPort = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
@ -45,30 +40,44 @@ in {
default = "64M"; default = "64M";
description = "How much memory to use at most."; description = "How much memory to use at most.";
}; };
logLevel = mkOption {
type = types.enum [ "CRITICAL" "ERROR" "WARNING" "INFO" "DEBUG" "MINI" ];
default = "INFO";
description = "How much to log";
};
extraArgs = mkOption {
type = types.listOf types.str;
default = [];
description = "Additional arguments";
};
}; };
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewallPort [ cfg.port ]; networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewallPort [ cfg.port ];
systemd.services.pykms = let systemd.services.pykms = {
home = "/var/lib/pykms";
in {
description = "Python KMS"; description = "Python KMS";
after = [ "network.target" ]; after = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
# python programs with DynamicUser = true require HOME to be set # python programs with DynamicUser = true require HOME to be set
environment.HOME = home; environment.HOME = libDir;
serviceConfig = with pkgs; { serviceConfig = with pkgs; {
DynamicUser = true; DynamicUser = true;
StateDirectory = baseNameOf home; StateDirectory = baseNameOf libDir;
ExecStartPre = "${getBin pykms}/bin/create_pykms_db.sh ${home}/clients.db"; ExecStartPre = "${getBin pykms}/libexec/create_pykms_db.sh ${libDir}/clients.db";
ExecStart = lib.concatStringsSep " " ([ ExecStart = lib.concatStringsSep " " ([
"${getBin pykms}/bin/server.py" "${getBin pykms}/bin/server"
"--logfile STDOUT"
"--loglevel ${cfg.logLevel}"
] ++ cfg.extraArgs ++ [
cfg.listenAddress cfg.listenAddress
(toString cfg.port) (toString cfg.port)
] ++ lib.optional cfg.verbose "--verbose"); ]);
WorkingDirectory = home; ProtectHome = "tmpfs";
WorkingDirectory = libDir;
Restart = "on-failure"; Restart = "on-failure";
MemoryLimit = cfg.memoryLimit; MemoryLimit = cfg.memoryLimit;
}; };