merge dev ...

This commit is contained in:
yumaojun
2015-11-15 23:30:37 +08:00
parent 218ba0d189
commit 6da97c5403
16 changed files with 42 additions and 51 deletions

View File

@@ -119,7 +119,7 @@ def db_del_user(username):
def gen_ssh_key(username, password='',
key_dir=os.path.join(BASE_DIR, 'keys/user/'),
key_dir=os.path.join(BASE_DIR, 'role_keys/user/'),
authorized_keys=True, home="/home", length=2048):
"""
generate a user ssh key in a property dir