dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nixos/taskserver: port helper-tool to Python 3

Browse Source
This commit is contained in:
pacien 2022-02-11 03:04:34 +01:00
parent 086e8066f5
commit 9013352e3f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/misc/taskserver/default.nix
View File

@ -106,7 +106,7 @@ let
certtool = "${pkgs.gnutls.bin}/bin/certtool";
nixos-taskserver = with pkgs.python2.pkgs; buildPythonApplication {
nixos-taskserver = with pkgs.python3.pkgs; buildPythonApplication {
name = "nixos-taskserver";
src = pkgs.runCommand "nixos-taskserver-src" { preferLocalBuild = true; } ''

10
nixos/modules/services/misc/taskserver/helper-tool.py
View File

@ -90,7 +90,7 @@ def certtool_cmd(*args, **kwargs):
"""
return subprocess.check_output(
[CERTTOOL_COMMAND] + list(args),
preexec_fn=lambda: os.umask(0077),
preexec_fn=lambda: os.umask(0o077),
stderr=subprocess.STDOUT,
**kwargs
)
@ -164,7 +164,7 @@ def generate_key(org, user):
pubcert = os.path.join(basedir, "public.cert")
try:
os.makedirs(basedir, mode=0700)
os.makedirs(basedir, mode=0o700)
certtool_cmd("-p", "--bits", CERT_BITS, "--outfile", privkey)
@ -301,7 +301,7 @@ class Organisation(object):
return None
if name not in self.users.keys():
output = taskd_cmd("add", "user", self.name, name,
capture_stdout=True)
capture_stdout=True, encoding='utf-8')
key = RE_USERKEY.search(output)
if key is None:
msg = "Unable to find key while creating user {}."
@ -412,9 +412,9 @@ class Manager(object):
if org is not None:
if self.ignore_imperative and is_imperative(name):
return
for user in org.users.keys():
for user in list(org.users.keys()):
org.del_user(user)
for group in org.groups.keys():
for group in list(org.groups.keys()):
org.del_group(group)
taskd_cmd("remove", "org", name)
del self._lazy_orgs[name]