|
|
|
@ -3965,6 +3965,17 @@ class servJabber(shareLdap):
|
|
|
|
|
fullHostName = "%s.%s"%(self.clVars.Get('os_net_hostname'),
|
|
|
|
|
self.clVars.Get('os_net_domain'))
|
|
|
|
|
self.clVars.Set("sr_jabber_host",fullHostName,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'):
|
|
|
|
@ -4028,7 +4039,7 @@ class servJabber(shareLdap):
|
|
|
|
|
if not self.setDaemonAutostart("ejabberd"):
|
|
|
|
|
return False
|
|
|
|
|
#запишем переменные для сервера
|
|
|
|
|
jabberHost = self.clVars.Get("sr_jabber_host")
|
|
|
|
|
jabberHost = self.clVars.Get("sr_jabber_host",)
|
|
|
|
|
self.clVars.Write("sr_jabber_host",jabberHost,True,"local")
|
|
|
|
|
#запишем переменные для клиента
|
|
|
|
|
clientVars = ["sr_jabber_host","sr_jabber_crypt","sr_jabber_port"]
|
|
|
|
@ -5929,7 +5940,7 @@ the password will be changed only for Samba account")
|
|
|
|
|
{'progAccess':(5,),
|
|
|
|
|
'shortOption':"L",
|
|
|
|
|
'longOption':"lock",
|
|
|
|
|
'helpChapter':_("Samba service options"),
|
|
|
|
|
'helpChapter':_("Samba service options"),sr_jabber_history
|
|
|
|
|
'help':_("lock the user account")
|
|
|
|
|
},
|
|
|
|
|
{'progAccess':(5,),
|
|
|
|
@ -6014,6 +6025,13 @@ the password will be changed only for Samba account")
|
|
|
|
|
'helpChapter':_("Jabber service options"),
|
|
|
|
|
'help':_("jabber host, default - hostname")
|
|
|
|
|
},
|
|
|
|
|
{'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,),
|
|
|
|
|