From 81cd220c67154ee7f7aaa4ea842a86fc39944d7f Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 5 Jul 2019 09:46:03 +0800 Subject: nixos/pymks: log to journal --- nixos/modules/rename.nix | 2 ++ nixos/modules/services/misc/pykms.nix | 39 +++++++++++++++++++++-------------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 0c7c45a4708..802ffcdc94e 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -66,6 +66,8 @@ with lib; (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" "setuidPrograms" ] "Use security.wrappers instead") diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix index ab00086e591..e2d1254602b 100644 --- a/nixos/modules/services/misc/pykms.nix +++ b/nixos/modules/services/misc/pykms.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.services.pykms; + libDir = "/var/lib/pykms"; in { meta.maintainers = with lib.maintainers; [ peterhoeg ]; @@ -28,12 +29,6 @@ in { description = "The port on which to listen."; }; - verbose = mkOption { - type = types.bool; - default = false; - description = "Show verbose output."; - }; - openFirewallPort = mkOption { type = types.bool; default = false; @@ -45,30 +40,44 @@ in { default = "64M"; 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 { networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewallPort [ cfg.port ]; - systemd.services.pykms = let - home = "/var/lib/pykms"; - in { + systemd.services.pykms = { description = "Python KMS"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; # python programs with DynamicUser = true require HOME to be set - environment.HOME = home; + environment.HOME = libDir; serviceConfig = with pkgs; { DynamicUser = true; - StateDirectory = baseNameOf home; - ExecStartPre = "${getBin pykms}/bin/create_pykms_db.sh ${home}/clients.db"; + StateDirectory = baseNameOf libDir; + ExecStartPre = "${getBin pykms}/libexec/create_pykms_db.sh ${libDir}/clients.db"; ExecStart = lib.concatStringsSep " " ([ - "${getBin pykms}/bin/server.py" + "${getBin pykms}/bin/server" + "--logfile STDOUT" + "--loglevel ${cfg.logLevel}" + ] ++ cfg.extraArgs ++ [ cfg.listenAddress (toString cfg.port) - ] ++ lib.optional cfg.verbose "--verbose"); - WorkingDirectory = home; + ]); + ProtectHome = "tmpfs"; + WorkingDirectory = libDir; Restart = "on-failure"; MemoryLimit = cfg.memoryLimit; }; -- cgit v1.2.3 From bf9cecf28d97b9cbcef5fc65cd8cbd297d405137 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 5 Jul 2019 09:46:13 +0800 Subject: pykms: 20180208 -> 20190611 New upstream. --- pkgs/tools/networking/pykms/default.nix | 54 +++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix index fdfa0f808ec..e1a13b73120 100644 --- a/pkgs/tools/networking/pykms/default.nix +++ b/pkgs/tools/networking/pykms/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, python3Packages, writeText, writeScript +{ stdenv, runtimeShell, fetchFromGitHub, python3, writeText, writeScript , coreutils, sqlite }: -with python3Packages; +with python3.pkgs; let dbSql = writeText "create_pykms_db.sql" '' @@ -18,38 +18,45 @@ let ''; dbScript = writeScript "create_pykms_db.sh" (with stdenv.lib; '' - #!${stdenv.shell} -eu + #!${runtimeShell} - db=$1 + set -eEuo pipefail - ${getBin coreutils}/bin/install -d $(dirname $db) + db=$1 if [ ! -e $db ] ; then ${getBin sqlite}/bin/sqlite3 $db < ${dbSql} fi ''); -in buildPythonApplication { +in buildPythonApplication rec { pname = "pykms"; - version = "20180208"; + version = "20190611"; src = fetchFromGitHub { - owner = "ThunderEX"; + owner = "SystemRage"; repo = "py-kms"; - rev = "a1666a0ee5b404569a234afd05b164accc9a8845"; - sha256 = "17yj5n8byxp09l5zkap73hpphjy35px84wy68ps824w8l0l8kcd4"; + rev = "dead208b1593655377fe8bc0d74cc4bead617103"; + sha256 = "065qpkfqrahsam1rb43vnasmzrangan5z1pr3p6s0sqjz5l2jydp"; }; - propagatedBuildInputs = [ pytz ]; + sourceRoot = "source/py-kms"; - prePatch = '' - siteDir=$out/${python.sitePackages} + propagatedBuildInputs = [ systemd pytz tzlocal ]; - substituteInPlace kmsBase.py \ + postPatch = '' + siteDir=$out/${python3.sitePackages} + + substituteInPlace pykms_DB2Dict.py \ --replace "'KmsDataBase.xml'" "'$siteDir/KmsDataBase.xml'" + + # we are logging to journal + sed -i pykms_Misc.py \ + -e '6ifrom systemd import journal' \ + -e 's/log_obj.addHandler(log_handler)/log_obj.addHandler(journal.JournalHandler())/' ''; - dontBuild = true; + format = "other"; # there are no tests doCheck = false; @@ -57,18 +64,19 @@ in buildPythonApplication { installPhase = '' runHook preInstall - mkdir -p $out/{bin,share/doc/pykms} $siteDir + mkdir -p $siteDir mv * $siteDir - for b in client server ; do - makeWrapper ${python.interpreter} $out/bin/$b.py \ - --argv0 $b \ - --add-flags $siteDir/$b.py + for b in Client Server ; do + makeWrapper ${python.interpreter} $out/bin/''${b,,} \ + --argv0 ''${b,,} \ + --add-flags $siteDir/pykms_$b.py \ + --prefix PYTHONPATH : "$(toPythonPath ${systemd})" done - install -m755 ${dbScript} $out/bin/create_pykms_db.sh + install -Dm755 ${dbScript} $out/libexec/create_pykms_db.sh - mv $siteDir/README.md $out/share/doc/pykms/ + install -Dm644 ../README.md -t $out/share/doc/pykms ${python.interpreter} -m compileall $siteDir @@ -77,7 +85,7 @@ in buildPythonApplication { meta = with stdenv.lib; { description = "Windows KMS (Key Management Service) server written in Python"; - homepage = https://github.com/ThunderEX/py-kms; + homepage = "https://github.com/SystemRage/py-kms"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; -- cgit v1.2.3