|
|
|
@ -5660,16 +5660,6 @@ in Unix service") %str(jabberId))
|
|
|
|
|
jabberHosts = ",".join(unicHostsList)
|
|
|
|
|
self.clVars.Set("sr_jabber_hosts",jabberHosts,True)
|
|
|
|
|
|
|
|
|
|
if options.has_key("history"):
|
|
|
|
|
history = options["history"].strip()
|
|
|
|
|
if history in ("on", "off"):
|
|
|
|
|
self.clVars.Set("sr_jabber_history", history)
|
|
|
|
|
else :
|
|
|
|
|
self.printERROR(\
|
|
|
|
|
_("Command line incorrect, \
|
|
|
|
|
'history=%s' - error, to use 'history on' or 'history off'")\
|
|
|
|
|
%str(history))
|
|
|
|
|
return False
|
|
|
|
|
# Cоздаем объект профиль устанавливая директорию jabber для
|
|
|
|
|
# файлов профилей
|
|
|
|
|
if not self.applyProfilesFromService('jabber'):
|
|
|
|
@ -7531,17 +7521,6 @@ outdated. If the backup is obsolete, use cl-backup-server."))
|
|
|
|
|
# Предыдущее имя хоста для Jabber
|
|
|
|
|
previousJabberHost = self.clVars.Get("sr_jabber_host")
|
|
|
|
|
if serviceUpdate in ["all","jabber"]:
|
|
|
|
|
# История для jabber
|
|
|
|
|
if options.has_key("history"):
|
|
|
|
|
history = options["history"].strip()
|
|
|
|
|
if history in ("on", "off"):
|
|
|
|
|
self.clVars.Set("sr_jabber_history", history)
|
|
|
|
|
else:
|
|
|
|
|
self.printERROR(\
|
|
|
|
|
_("Command line incorrect, \
|
|
|
|
|
'history=%s' - error, to use 'history on' or 'history off'")\
|
|
|
|
|
%str(history))
|
|
|
|
|
return False
|
|
|
|
|
# Устанавливаем основной хост jabber cервиса
|
|
|
|
|
if options.has_key("host"):
|
|
|
|
|
newHostName = options['host']
|
|
|
|
@ -10017,13 +9996,6 @@ example: --range 192.168.0.2,192.168.0.50')
|
|
|
|
|
'helpChapter':_("Jabber service options"),
|
|
|
|
|
'help':_("jabber supplementary hosts, (comma delimited)")
|
|
|
|
|
},
|
|
|
|
|
{'progAccess':(6,),
|
|
|
|
|
'optVal':"CONDITION",
|
|
|
|
|
'longOption':"history",
|
|
|
|
|
'helpChapter':_("Jabber service options"),
|
|
|
|
|
'help':_("enabled or disabled jabber history logging, default disable.\
|
|
|
|
|
(on/off)")
|
|
|
|
|
},
|
|
|
|
|
# Опции cl-passwd
|
|
|
|
|
# LDAP пользователь
|
|
|
|
|
{'progAccess':(7,),
|
|
|
|
@ -10112,13 +10084,6 @@ example: --range 192.168.0.2,192.168.0.50')
|
|
|
|
|
'help':_("restore services configuration files and LDAP branches")
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
{'progAccess':(9,),
|
|
|
|
|
'optVal':"CONDITION",
|
|
|
|
|
'longOption':"history",
|
|
|
|
|
'helpChapter':_("Jabber service options"),
|
|
|
|
|
'help':_("enabled or disabled jabber history logging, default disable.\
|
|
|
|
|
(on/off)")
|
|
|
|
|
},
|
|
|
|
|
{'progAccess':(9,),
|
|
|
|
|
'optVal':"HOST",
|
|
|
|
|
'longOption':"host",
|
|
|
|
|