|
|
|
@ -732,7 +732,7 @@ class shareLdap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
|
runDaemons['postfix'] = False
|
|
|
|
|
continue
|
|
|
|
|
addDirDict = {"slapd":("openldap","slapd.pid"),
|
|
|
|
|
"samba":("samba","smbd.pid"),
|
|
|
|
|
"samba":("/var/lib/init.d/daemons","samba"),
|
|
|
|
|
"dovecot":("dovecot","master.pid"),
|
|
|
|
|
"ejabberd":("/var/lib/init.d/daemons","ejabberd"),
|
|
|
|
|
"proftpd":("","proftpd.pid")
|
|
|
|
@ -5611,9 +5611,9 @@ outdated. If the backup is obsolete, use cl-backup."))
|
|
|
|
|
verbose = False
|
|
|
|
|
if options.has_key("v"):
|
|
|
|
|
verbose = True
|
|
|
|
|
# Флаг почтового релея
|
|
|
|
|
flagMailRelay = False
|
|
|
|
|
if not flagError:
|
|
|
|
|
# Флаг почтового релея
|
|
|
|
|
flagMailRelay = False
|
|
|
|
|
for service in servInstalled:
|
|
|
|
|
if service == "ldap":
|
|
|
|
|
continue
|
|
|
|
@ -5718,9 +5718,15 @@ it was added by the calculate-server")
|
|
|
|
|
# В случае репликации
|
|
|
|
|
if self.clVars.Get("ld_repl_id") and\
|
|
|
|
|
self.clVars.Get("ld_repl_set") == "on":
|
|
|
|
|
# Добавляем в крон скрипт для чистки директорий
|
|
|
|
|
if not objRepl.cronReplicationON():
|
|
|
|
|
return False
|
|
|
|
|
# Если не почтовый релей
|
|
|
|
|
if not flagMailRelay:
|
|
|
|
|
# Добавляем в крон скрипт для чистки директорий
|
|
|
|
|
if not objRepl.cronReplicationON():
|
|
|
|
|
return False
|
|
|
|
|
else:
|
|
|
|
|
# Удаляем из крона скрипт для чистки директорий
|
|
|
|
|
if not objRepl.cronReplicationOFF():
|
|
|
|
|
return False
|
|
|
|
|
# Добавляем ветку репликации
|
|
|
|
|
if not objRepl.addReplDN(self.clVars):
|
|
|
|
|
return False
|
|
|
|
@ -8407,6 +8413,8 @@ class servRepl(shareLdap):
|
|
|
|
|
self.servUnixObj = self.servSambaObj.servUnixObj
|
|
|
|
|
# Сервис Mail
|
|
|
|
|
self.servMailObj = servMail()
|
|
|
|
|
# Cервис Jabber
|
|
|
|
|
self.servJabberObj = servJabber()
|
|
|
|
|
# DN ветки Worked
|
|
|
|
|
self.relWorkedDN = False
|
|
|
|
|
# DN ветки Replication/Mail
|
|
|
|
@ -9176,7 +9184,7 @@ if %%errorlevel%%==0 NET USE T: \\\\%s\\ftp' %(netbios,netbios,netbios)
|
|
|
|
|
# Удаляем пользователя из ветки Worked
|
|
|
|
|
if not self.delReplWorkedUser(userName):
|
|
|
|
|
errMessage = _("Can not remove user %s \
|
|
|
|
|
in the LDAP branch 'Worked'")
|
|
|
|
|
in the LDAP branch 'Worked'")%userName
|
|
|
|
|
if logObj:
|
|
|
|
|
logObj.writeError(errMessage)
|
|
|
|
|
self.printERROR(errMessage)
|
|
|
|
@ -9200,7 +9208,25 @@ in the LDAP branch 'Worked'")
|
|
|
|
|
self.printWARNING(message)
|
|
|
|
|
else:
|
|
|
|
|
errMessage = _("Can not delete mail user \
|
|
|
|
|
%s")
|
|
|
|
|
%s")%userName
|
|
|
|
|
if logObj:
|
|
|
|
|
logObj.writeError(errMessage)
|
|
|
|
|
self.printERROR(errMessage)
|
|
|
|
|
flagError = True
|
|
|
|
|
break
|
|
|
|
|
# Удаляем пользователя из Jabber
|
|
|
|
|
if self.isServiceSetup("jabber") and\
|
|
|
|
|
self.servJabberObj.searchUserToName(userName):
|
|
|
|
|
if self.servJabberObj.delUserJabberServer(\
|
|
|
|
|
userName, {}, False):
|
|
|
|
|
message = _("deleted jabber user %s")\
|
|
|
|
|
%userName
|
|
|
|
|
if logObj:
|
|
|
|
|
logObj.writeSuccess(message)
|
|
|
|
|
self.printWARNING(message)
|
|
|
|
|
else:
|
|
|
|
|
errMessage = _("Can not delete jabber user \
|
|
|
|
|
%s")%userName
|
|
|
|
|
if logObj:
|
|
|
|
|
logObj.writeError(errMessage)
|
|
|
|
|
self.printERROR(errMessage)
|
|
|
|
|