|
|
|
@ -5714,7 +5714,7 @@ outdated. If the backup is obsolete, use cl-backup."))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def updateServer(self, options, serviceUpdate, clVars=False,
|
|
|
|
|
noInputAllowNetServices=[]):
|
|
|
|
|
noInputAllowNetServices=[], printReplServ=True):
|
|
|
|
|
"""Перегенерируем конфигурационные файлы
|
|
|
|
|
|
|
|
|
|
определенного или всех сервисов
|
|
|
|
@ -5731,6 +5731,22 @@ outdated. If the backup is obsolete, use cl-backup."))
|
|
|
|
|
self.printERROR(_("Not found 'serverID' this server") + " ...")
|
|
|
|
|
self.printERROR(_("variable 'ld_repl_id' empty") + " ...")
|
|
|
|
|
return False
|
|
|
|
|
if printReplServ and self.clVars.Get("ld_repl_set") == "on":
|
|
|
|
|
# Вывод списка реплицируемых серверов
|
|
|
|
|
unixReplServ = self.clVars.Get("ld_repl_unix_servers")
|
|
|
|
|
sambaReplServ = self.clVars.Get("ld_repl_samba_servers")
|
|
|
|
|
mailReplServ = self.clVars.Get("ld_repl_mail_servers")
|
|
|
|
|
if unixReplServ:
|
|
|
|
|
self.printSUCCESS(\
|
|
|
|
|
_("Replication servers for service Unix: %s")\
|
|
|
|
|
%", ".join(unixReplServ.split(",")))
|
|
|
|
|
if sambaReplServ:
|
|
|
|
|
self.printSUCCESS(\
|
|
|
|
|
_("Replication servers for service Samba: %s")\
|
|
|
|
|
%", ".join(sambaReplServ.split(",")))
|
|
|
|
|
if mailReplServ:
|
|
|
|
|
self.printSUCCESS(_("Replication servers for service Mail: %s")\
|
|
|
|
|
%", ".join(mailReplServ.split(",")))
|
|
|
|
|
# Настройка почты
|
|
|
|
|
if serviceUpdate in ["all","mail"]:
|
|
|
|
|
if options.has_key("t"):
|
|
|
|
@ -9969,25 +9985,13 @@ together with option '-r'") + " ...")
|
|
|
|
|
self.printERROR(_("Not found 'serverID' this server") + " ...")
|
|
|
|
|
self.printERROR(_("variable 'ld_repl_id' empty") + " ...")
|
|
|
|
|
return False
|
|
|
|
|
# Делаем update cервиса Samba в случае опции off
|
|
|
|
|
# Делаем update cервиса Samba в случае опции off и не показываем
|
|
|
|
|
# реплицируемые серверы
|
|
|
|
|
if service == "unix" and self.clVars.Get("sr_samba_set") == "on" and\
|
|
|
|
|
options.has_key('off'):
|
|
|
|
|
if not self.servLdapObj.updateServer({},"samba",self.clVars):
|
|
|
|
|
return False
|
|
|
|
|
# Вывод списка реплицируемых серверов
|
|
|
|
|
unixReplServ = self.clVars.Get("ld_repl_unix_servers")
|
|
|
|
|
sambaReplServ = self.clVars.Get("ld_repl_samba_servers")
|
|
|
|
|
mailReplServ = self.clVars.Get("ld_repl_mail_servers")
|
|
|
|
|
if unixReplServ:
|
|
|
|
|
self.printSUCCESS(_("Replication servers for service Unix: %s")\
|
|
|
|
|
%", ".join(unixReplServ.split(",")))
|
|
|
|
|
if sambaReplServ:
|
|
|
|
|
print sambaReplServ
|
|
|
|
|
self.printSUCCESS(_("Replication servers for service Samba: %s")\
|
|
|
|
|
%", ".join(sambaReplServ.split(",")))
|
|
|
|
|
if mailReplServ:
|
|
|
|
|
self.printSUCCESS(_("Replication servers for service Mail: %s")\
|
|
|
|
|
%", ".join(mailReplServ.split(",")))
|
|
|
|
|
if not self.servLdapObj.updateServer({},"samba",self.clVars,
|
|
|
|
|
[],False):
|
|
|
|
|
return False
|
|
|
|
|
# Делаем update сервиса если нет ветки репликации она создается
|
|
|
|
|
if not self.servLdapObj.updateServer({},service,self.clVars):
|
|
|
|
|
return False
|
|
|
|
|