github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-24 01:16:11 +00:00
Code Issues Projects Releases Wiki Activity

update merge conflict.

Browse Source
This commit is contained in:
yumaojun
2015-11-19 13:20:27 +08:00
parent 8017b1b479 6582ee1624
commit 757f7beeaf
12 changed files with 126 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jperm/utils.py
View File

@@ -45,8 +45,8 @@ def gen_keys():
:return: 返回目录名(uuid)
"""
key_basename = "key-" + uuid4().hex
key_path_dir = os.path.join(KEY_DIR, 'role_key', key_basename)
makedirs(key_path_dir, 0775)
key_path_dir = os.path.join(KEY_DIR, key_basename)
makedirs(key_path_dir, 0755)
key = RSAKey.generate(2048)
private_key = os.path.join(key_path_dir, 'id_rsa')