Добавлен ключ --history (включение истории сообщений jabber) в программу cl-update

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

pym/cl_ldap.py

@@ -4106,8 +4106,11 @@ class servJabber(shareLdap):
         if not self.setDaemonAutostart("ejabberd"):
             return False
         #запишем переменные для сервера
-        jabberHost = self.clVars.Get("sr_jabber_host","sr_jabber_history")
+        jabberHost = self.clVars.Get("sr_jabber_host")
         self.clVars.Write("sr_jabber_host",jabberHost,True,"local")
+        self.clVars.Write("sr_jabber_history",
+                          self.clVars.Get("sr_jabber_history"),
+                          True,"local")
         #запишем переменные для клиента
         clientVars = ["sr_jabber_host","sr_jabber_crypt","sr_jabber_port"]
         if not self.saveVarsClient(clientVars):
@@ -4931,13 +4934,23 @@ class servLdap(shareLdap):
                     servInstalled.append(serv)
         return (servicePaths, servInstalled)
 
-    def updateServer(self, serviceUpdate):
+    def updateServer(self, options, serviceUpdate):
         """Перегенерируем конфигурационные файлы
 
         определенного или всех сервисов
         """
         # Создаем переменные
         self.createClVars()
+        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
         # находим установленные сервисы
         servicePaths, servInstalled = self.getServiceSetupPathProfiles()
         if not servicePaths:
@@ -4955,6 +4968,7 @@ class servLdap(shareLdap):
                 self.printERROR(_("Service %s not installed")%serviceUpdate)
             return False
         ldapParser = iniLdapParser()
+        # Установка переменных
         for service in servInstalled:
             if service == "ldap":
                 continue
@@ -4963,19 +4977,29 @@ class servLdap(shareLdap):
                 self.printERROR(_("Not found password from service %s")%service)
                 flagError = True
                 break
-                self.clVars.Set("ld_unix_pw",adminPw)
-            if not flagError and not self.applyProfilesFromService(service):
-                flagError = True
-                break
-            self.printOK(_("Update config from service %s")\
-                           %service.capitalize())
-            self.stopServices([service])
-            self.startServices([service], False)
+            self.clVars.Set("ld_%s_pw"%service,adminPw, True)
+        # Наложение профилей
+        if not flagError:
+            for service in servInstalled:
+                if service == "ldap":
+                    continue
+                if not flagError and not self.applyProfilesFromService(service):
+                    flagError = True
+                    break
+                self.printOK(_("Update config from service %s")\
+                            %service.capitalize())
+                self.stopServices([service])
+                self.startServices([service], False)
         # Перезапускаем ldap
         if not flagError:
             service = "ldap"
             self.stopServices([service])
             self.startServices([service], False)
+        #запишем переменные для сервера
+        if not flagError:
+            self.clVars.Write("sr_jabber_history",
+                              self.clVars.Get("sr_jabber_history"),
+                              True,"local")
         if flagError:
             return False
         else:
@@ -4983,7 +5007,7 @@ class servLdap(shareLdap):
 
     def updateLdapServer(self, options, serviceUpdate):
         """Обновление сервисов"""
-        return self.updateServer(serviceUpdate)
+        return self.updateServer(options ,serviceUpdate)
 
     def backupServer(self):
         """Сохраняет настройки установленных сервисов и базу LDAP"""
@@ -6173,6 +6197,15 @@ the password will be changed only for Samba account")
          'helpChapter':_("Common options"),
          'help':_("restore services configuration files and LDAP branches")
         },
+
+        {'progAccess':(9,),
+         'optVal':"CONDITION",
+         'longOption':"history",
+         'helpChapter':_("Common options"),
+         'help':_("enabled or disabled jabber history logging, default disable.\
+ (on/off)")
+        },
+
         #{'progAccess':(0,1,2,4,5,6),
          #'shortOption':"s",
          #'longOption':"set",