git-svn-id: http://svn.calculate.ru/calculate2/calculate-server/trunk@1199 c91db197-33c1-4113-bf15-f8a5c547ca64

pym/cl_ldap.py

@@ -5855,6 +5855,14 @@ outdated. If the backup is obsolete, use cl-backup."))
 'history=%s' - error, to use 'history on' or 'history off'")\
                             %str(history) + " ...")
                     return False
+            if options.has_key("host"):
+                newHostName = options['host']
+                if not "." in newHostName:
+                    newHostName = "%s.%s" %(newHostName,
+                                            self.clVars.Get('os_net_domain'))
+                if newHostName != previousJabberHost:
+                    # Устанавливаем перемемнную
+                    self.clVars.Set("sr_jabber_host",newHostName,True)
         # находим установленные сервисы
         servInstalled = self.getServiceSetup()
         if not servInstalled:
@@ -5946,6 +5954,7 @@ it was added by the calculate-server")
                     if self.clVars.Get("ld_repl_mail_set") == "on" and\
                         self.clVars.Get("sr_mail_relay_set") == "on":
                         flagMailRelay = True
+                # Наложение профилей
                 if not flagError:
                     if flagMailRelay:
                         files = self.applyProfilesFromService(service, verbose,
@@ -5990,12 +5999,7 @@ it was added by the calculate-server")
         if not flagError and serviceUpdate in ["all","jabber"]:
             # Замена имени хоста для сервиса Jabber
             if options.has_key("host"):
-                newHostName = options['host']
-                if not "." in newHostName:
-                    newHostName = "%s.%s" %(newHostName,
-                                            self.clVars.Get('os_net_domain'))
-                if newHostName != previousJabberHost:
-                    self.clVars.Set("sr_jabber_host",newHostName,True)
+                if self.clVars.Get("sr_jabber_host") != previousJabberHost:
                     # Установка в LDAP ветке Jabber cервиса нового имени хоста
                     if not self.servJabberObj.setHostName(newHostName,
                                                           previousJabberHost):