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

pym/cl_ldap.py

@@ -3532,6 +3532,7 @@ Unix service ...") %str(primaryMail))
          # Установка доступных сетей по умолчанию
         self.clVars.Set("sr_mail_net_allow", self.clVars.Get("os_net_allow"),
                         True)
+        
         if self.clVars.Get("sr_unix_set") != "on":
             self.printERROR(_("Unix service is not setuped"))
             self.printWARNING(_("Setup Unix service"))
@@ -3587,9 +3588,11 @@ Unix service ...") %str(primaryMail))
         self.clVars.Set("cl_pass_service","mail")
         self.clVars.Write("sr_mail_set","off")
         # Почтовый ност
+        fullHostName = "%s.%s"%(self.clVars.Get('os_net_hostname'),
+                               self.clVars.Get('os_net_domain'))
         if options.has_key("host"):
             fullHostName = options['host']
-            self.clVars.Set("sr_mail_host",fullHostName,True)
+        self.clVars.Set("sr_mail_host",fullHostName,True)
         mailType = "imap"
         if options.has_key("t"):
             mailType = options['t']
@@ -4259,9 +4262,12 @@ class servJabber(shareLdap):
         # Имя устанавливаемого сервиса
         self.clVars.Set("cl_pass_service","jabber")
         self.clVars.Write("sr_jabber_set","off")
+        # Jabber host
+        fullHostName = "%s.%s"%(self.clVars.Get('os_net_hostname'),
+                               self.clVars.Get('os_net_domain'))
         if options.has_key("host"):
             fullHostName = options['host']
-            self.clVars.Set("sr_jabber_host",fullHostName,True)
+        self.clVars.Set("sr_jabber_host",fullHostName,True)
 
         if options.has_key("history"):
             history = options["history"].strip()