commit 83a57cfa311e0f3ed4edeec213c6091bc30e2d89 · pyrox.dev/nixpkgs

nixos/modules/services/misc/pykms.nix

···

       82
       82
        
               ]);

     

       83
       83
        
               ProtectHome = "tmpfs";

     

       84
       84
        
               WorkingDirectory = libDir;

     

       85
       85
       +
               SyslogIdentifier = "pykms";

     

       85
       86
        
               Restart = "on-failure";

     

       86
       87
        
               MemoryLimit = cfg.memoryLimit;

     

       87
       88
        
             };

+3 -5

pkgs/tools/networking/pykms/default.nix

···

       44
       44
        
       

     

       45
       45
        
         propagatedBuildInputs = [ systemd pytz tzlocal ];

     

       46
       46
        
       

     

       47
       47
       +
         # Fix https://github.com/SystemRage/py-kms/issues/64 :

     

       48
       48
       +
         patches = [ ./log-to-current-directory-by-default.patch ];

     

       49
       49
       +
       

     

       47
       50
        
         postPatch = ''

     

       48
       51
        
           siteDir=$out/${python3.sitePackages}

     

       49
       52
        
       

     

       50
       53
        
           substituteInPlace pykms_DB2Dict.py \

     

       51
       54
        
             --replace "'KmsDataBase.xml'" "'$siteDir/KmsDataBase.xml'"

     

       52
       52
       -
       

     

       53
       53
       -
           # we are logging to journal

     

       54
       54
       -
           sed -i pykms_Misc.py \

     

       55
       55
       -
             -e '6ifrom systemd import journal' \

     

       56
       56
       -
             -e 's/log_obj.addHandler(log_handler)/log_obj.addHandler(journal.JournalHandler())/'

     

       57
       55
        
         '';

     

       58
       56
        
       

     

       59
       57
        
         format = "other";

+20

pkgs/tools/networking/pykms/log-to-current-directory-by-default.patch

···

       1
       1
       +
       # By default, create log files in current directory, instead of the script directory.

     

       2
       2
       +
       --- ../original/py-kms/pykms_Client.py

     

       3
       3
       +
       +++ py-kms/pykms_Client.py

     

       4
       4
       +
       @@ -48,5 +48,5 @@

     

       5
       5
       +
                            'choi' : ["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG", "MINI"]},

     

       6
       6
       +
                'lfile' : {'help' : 'Use this option to set an output log file. The default is \"pykms_logclient.log\" or type \"STDOUT\" to view log info on stdout.',

     

       7
       7
       +
       -                   'def' : os.path.dirname(os.path.abspath( __file__ )) + "/pykms_logclient.log", 'des' : "logfile"},

     

       8
       8
       +
       +                   'def' : "pykms_logclient.log", 'des' : "logfile"},

     

       9
       9
       +
                'lsize' : {'help' : 'Use this flag to set a maximum size (in MB) to the output log file. Desactivated by default.', 'def' : 0, 'des': "logsize"},

     

       10
       10
       +
                }

     

       11
       11
       +
       --- ../original/py-kms/pykms_Server.py

     

       12
       12
       +
       +++ py-kms/pykms_Server.py

     

       13
       13
       +
       @@ -85,5 +85,5 @@

     

       14
       14
       +
                            'choi' : ["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG", "MINI"]},

     

       15
       15
       +
                'lfile' : {'help' : 'Use this option to set or not an output log file. The default is \"pykms_logserver.log\" or type \"STDOUT\" to view log info on stdout.',

     

       16
       16
       +
       -                   'def' : os.path.dirname(os.path.abspath( __file__ )) + "/pykms_logserver.log", 'des' : "logfile"},

     

       17
       17
       +
       +                   'def' : "pykms_logserver.log", 'des' : "logfile"},

     

       18
       18
       +
                'lsize' : {'help' : 'Use this flag to set a maximum size (in MB) to the output log file. Desactivated by default.', 'def' : 0, 'des': "logsize"},

     

       19
       19
       +
                }

     

       20
       20
       +
           '');