fix create user certificate in bootstrap

master3.3
Спиридонов Денис 12 years ago
parent 7b6a7d5997
commit 386c857997

@ -130,7 +130,7 @@ def create_server_cert(cert, key, cert_path, args, port):
def create_client_cert(server_cert, cert_path, data_path, certbase, user_name):
client_cert_path = check_user_path(user_name)
if not client_cert_path:
print 'not client_cert_path'
print 'not exists client certificate path'
return 1
req_id = create_request(server_cert, cert_path, data_path, certbase, \
client_cert_path)
@ -138,13 +138,21 @@ def create_client_cert(server_cert, cert_path, data_path, certbase, user_name):
get_certificate(cert_path, data_path, certbase, client_cert_path)
def check_user_path(user_name):
if user_name == 'root':
home_dir = '/root'
else:
home_dir = '/home/' + user_name
if not path.isdir(home_dir):
print 'Not fount user %s' %user_name
try:
pwdObj = pwd.getpwnam(user_name)
except KeyError, e:
print e
return None
home_dir = pwdObj.pw_dir
if not path.isdir(home_dir):
from calculate.lib.utils.files import makeDirectory
if not makeDirectory(home_dir):
print _('could not create directory')
return None
os.chown(home_dir, pwdObj.pw_uid, pwdObj.pw_gid)
os.chmod(home_dir, 0777)
calc_dir = home_dir + '/.calculate'
if not path.isdir(calc_dir):
os.makedirs(calc_dir)

Loading…
Cancel
Save