github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-22 08:19:04 +00:00
Code Issues Projects Releases Wiki Activity

merge with dev

Browse Source
This commit is contained in:
ibuler
2015-11-18 15:22:26 +08:00
parent cf8e366ae1 8017b1b479
commit 2a6051ae35
14 changed files with 105 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jperm/utils.py
View File

@@ -45,8 +45,13 @@ def gen_keys():
:return: 返回目录名(uuid)
"""
key_basename = "key-" + uuid4().hex
<<<<<<< HEAD
key_path_dir = os.path.join(KEY_DIR, key_basename)
mkdir(key_path_dir, 0755)
=======
key_path_dir = os.path.join(KEY_DIR, 'role_key', key_basename)
makedirs(key_path_dir, 0775)
>>>>>>> dev
key = RSAKey.generate(2048)
private_key = os.path.join(key_path_dir, 'id_rsa')
@@ -61,6 +66,10 @@ def gen_keys():
content_file.write(data)
return key_path_dir
<<<<<<< HEAD
=======
>>>>>>> dev
if __name__ == "__main__":
print gen_keys()