···

       
106
       
106
       
 
       


     

       
107
       
107
       
 
       
  certtool = "${pkgs.gnutls.bin}/bin/certtool";

     

       
108
       
108
       
 
       


     

       
109
       
109
       
-
       
  nixos-taskserver = with pkgs.python2.pkgs; buildPythonApplication {

     

       
109
       
109
       
+
       
  nixos-taskserver = with pkgs.python3.pkgs; buildPythonApplication {

     

       
110
       
110
       
 
       
    name = "nixos-taskserver";

     

       
111
       
111
       
 
       


     

       
112
       
112
       
 
       
    src = pkgs.runCommand "nixos-taskserver-src" { preferLocalBuild = true; } ''

     

···

       
90
       
90
       
 
       
    """

     

       
91
       
91
       
 
       
    return subprocess.check_output(

     

       
92
       
92
       
 
       
        [CERTTOOL_COMMAND] + list(args),

     

       
93
       
93
       
-
       
        preexec_fn=lambda: os.umask(0077),

     

       
93
       
93
       
+
       
        preexec_fn=lambda: os.umask(0o077),

     

       
94
       
94
       
 
       
        stderr=subprocess.STDOUT,

     

       
95
       
95
       
 
       
        **kwargs

     

       
96
       
96
       
 
       
    )

     
···

       
164
       
164
       
 
       
    pubcert = os.path.join(basedir, "public.cert")

     

       
165
       
165
       
 
       


     

       
166
       
166
       
 
       
    try:

     

       
167
       
167
       
-
       
        os.makedirs(basedir, mode=0700)

     

       
167
       
167
       
+
       
        os.makedirs(basedir, mode=0o700)

     

       
168
       
168
       
 
       


     

       
169
       
169
       
 
       
        certtool_cmd("-p", "--bits", CERT_BITS, "--outfile", privkey)

     

       
170
       
170
       
 
       


     
···

       
301
       
301
       
 
       
            return None

     

       
302
       
302
       
 
       
        if name not in self.users.keys():

     

       
303
       
303
       
 
       
            output = taskd_cmd("add", "user", self.name, name,

     

       
304
       
304
       
-
       
                               capture_stdout=True)

     

       
304
       
304
       
+
       
                               capture_stdout=True, encoding='utf-8')

     

       
305
       
305
       
 
       
            key = RE_USERKEY.search(output)

     

       
306
       
306
       
 
       
            if key is None:

     

       
307
       
307
       
 
       
                msg = "Unable to find key while creating user {}."

     
···

       
412
       
412
       
 
       
        if org is not None:

     

       
413
       
413
       
 
       
            if self.ignore_imperative and is_imperative(name):

     

       
414
       
414
       
 
       
                return

     

       
415
       
415
       
-
       
            for user in org.users.keys():

     

       
415
       
415
       
+
       
            for user in list(org.users.keys()):

     

       
416
       
416
       
 
       
                org.del_user(user)

     

       
417
       
417
       
-
       
            for group in org.groups.keys():

     

       
417
       
417
       
+
       
            for group in list(org.groups.keys()):

     

       
418
       
418
       
 
       
                org.del_group(group)

     

       
419
       
419
       
 
       
            taskd_cmd("remove", "org", name)

     

       
420
       
420
       
 
       
            del self._lazy_orgs[name]