|
|
|
@ -608,6 +608,31 @@ class shareLdap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
|
self.printERROR(_("Path %s exists") %userDir)
|
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
def saveVarsClient(self, listVarName):
|
|
|
|
|
"""Записывает переменные для клиента calcualte-client"""
|
|
|
|
|
#считаем переменные для клиента
|
|
|
|
|
dictVar = {}
|
|
|
|
|
flagError = False
|
|
|
|
|
for varName in listVarName:
|
|
|
|
|
value = self.clVars.Get(varName)
|
|
|
|
|
if not value and value != "":
|
|
|
|
|
self.printERROR(_("Variables %s is empty")%varName)
|
|
|
|
|
flagError = True
|
|
|
|
|
break
|
|
|
|
|
dictVar[varName] = value
|
|
|
|
|
if flagError:
|
|
|
|
|
return False
|
|
|
|
|
#Запишем переменные в клиентскую секцию
|
|
|
|
|
for name,value in dictVar.items():
|
|
|
|
|
value = str(value)
|
|
|
|
|
if not self.clVars.Write(name,value,True,"remote","client"):
|
|
|
|
|
self.printERROR(_("Error writing variable %s")%name)
|
|
|
|
|
flagError = True
|
|
|
|
|
break
|
|
|
|
|
if flagError:
|
|
|
|
|
return False
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
def copyDir(self, destDir, srcDir):
|
|
|
|
|
"""Копируем директорию в другое место
|
|
|
|
|
|
|
|
|
@ -3183,6 +3208,14 @@ in Unix service ...") %str(primaryMail))
|
|
|
|
|
# Устанавливаем автозапуск демона
|
|
|
|
|
if not self.setDaemonAutostart("dovecot"):
|
|
|
|
|
return False
|
|
|
|
|
#запишем переменные для клиента
|
|
|
|
|
fullHostName = "%s.%s"%(self.clVars.Get('os_net_hostname'),
|
|
|
|
|
self.clVars.Get('os_net_domain'))
|
|
|
|
|
self.clVars.Set("sr_mail_host",fullHostName,True)
|
|
|
|
|
clientVars = ["sr_mail_host","sr_mail_crypt", "sr_mail_port",
|
|
|
|
|
"sr_mail_type","sr_mail_send_crypt","sr_mail_send_port"]
|
|
|
|
|
if not self.saveVarsClient(clientVars):
|
|
|
|
|
return False
|
|
|
|
|
self.clVars.Write("sr_mail_set","on")
|
|
|
|
|
self.printOK(_("Mail service configured") + " ...")
|
|
|
|
|
return True
|
|
|
|
@ -3786,6 +3819,13 @@ class servJabber(shareLdap):
|
|
|
|
|
# Устанавливаем автозапуск демона
|
|
|
|
|
if not self.setDaemonAutostart("ejabberd"):
|
|
|
|
|
return False
|
|
|
|
|
#запишем переменные для клиента
|
|
|
|
|
fullHostName = "%s.%s"%(self.clVars.Get('os_net_hostname'),
|
|
|
|
|
self.clVars.Get('os_net_domain'))
|
|
|
|
|
self.clVars.Set("sr_jabber_host",fullHostName,True)
|
|
|
|
|
clientVars = ["sr_jabber_host","sr_jabber_crypt","sr_jabber_port"]
|
|
|
|
|
if not self.saveVarsClient(clientVars):
|
|
|
|
|
return False
|
|
|
|
|
self.clVars.Write("sr_jabber_set","on")
|
|
|
|
|
self.printOK(_("Jabber service configured") + " ...")
|
|
|
|
|
return True
|
|
|
|
@ -4284,33 +4324,13 @@ class servSamba(shareLdap):
|
|
|
|
|
# Устанавливаем автозапуск демона
|
|
|
|
|
if not self.setDaemonAutostart("samba"):
|
|
|
|
|
return False
|
|
|
|
|
#считаем переменные для клиента
|
|
|
|
|
servDn = self.clVars.Get("ld_services_dn")
|
|
|
|
|
unixDN = self.clVars.Get("ld_unix_dn")
|
|
|
|
|
bindDn = self.clVars.Get("ld_bind_dn")
|
|
|
|
|
bindPw = self.clVars.Get("ld_bind_pw")
|
|
|
|
|
baseDn = self.clVars.Get("ld_base_dn")
|
|
|
|
|
# запишем их
|
|
|
|
|
if not (servDn and unixDN and bindDn and bindPw):
|
|
|
|
|
self.printERROR(_("Not found variables:"))
|
|
|
|
|
self.printERROR("ld_services_dn or ld_unix_dn \
|
|
|
|
|
or ld_bind_dn or ld_bind_pw or ld_base_dn")
|
|
|
|
|
return False
|
|
|
|
|
retServDn = self.clVars.Write("ld_services_dn",servDn,True,
|
|
|
|
|
"remote","client")
|
|
|
|
|
retUnixDN = self.clVars.Write("ld_unix_dn",unixDN,True,
|
|
|
|
|
"remote","client")
|
|
|
|
|
retBindDn = self.clVars.Write("ld_bind_dn",bindDn,True,
|
|
|
|
|
"remote","client")
|
|
|
|
|
retBindPw = self.clVars.Write("ld_bind_pw",bindPw,True,
|
|
|
|
|
"remote","client")
|
|
|
|
|
retBaseDn = self.clVars.Write("ld_base_dn",baseDn,True,
|
|
|
|
|
"remote","client")
|
|
|
|
|
if not (retServDn and retUnixDN and retBindDn and retBindPw and\
|
|
|
|
|
retBaseDn):
|
|
|
|
|
self.printERROR(_("Not write variable:"))
|
|
|
|
|
self.printERROR("ld_services_dn or ld_unix_dn \
|
|
|
|
|
or ld_bind_dn or ld_bind_pw or ld_base_dn")
|
|
|
|
|
#запишем переменные для клиента
|
|
|
|
|
fullHostName = "%s.%s"%(self.clVars.Get('os_net_hostname'),
|
|
|
|
|
self.clVars.Get('os_net_domain'))
|
|
|
|
|
self.clVars.Set("sr_samba_host",fullHostName,True)
|
|
|
|
|
clientVars = ["sr_samba_host","ld_services_dn", "ld_unix_dn",
|
|
|
|
|
"ld_bind_dn","ld_bind_pw","ld_base_dn"]
|
|
|
|
|
if not self.saveVarsClient(clientVars):
|
|
|
|
|
return False
|
|
|
|
|
self.clVars.Write("sr_samba_set","on")
|
|
|
|
|
self.printOK(_("Samba service configured") + " ...")
|
|
|
|
|