From 3aec909c51a9a2840f74ae83a06050bc5edc20ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= <mh@calculate.ru>
Date: Mon, 24 Apr 2017 13:41:17 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D1=91=D0=BD=20=D0=BF?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=20--histroy=20=D0=B4?=
 =?UTF-8?q?=D0=BB=D1=8F=20=D1=81=D0=B5=D1=80=D0=B2=D0=B8=D1=81=D0=B0=20jab?=
 =?UTF-8?q?ber?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Хранение истории включено по умолчанию и реализуется через mod_mam
---
 pym/cl_ldap.py | 35 -----------------------------------
 1 file changed, 35 deletions(-)

diff --git a/pym/cl_ldap.py b/pym/cl_ldap.py
index 519df51..82dfe97 100644
--- a/pym/cl_ldap.py
+++ b/pym/cl_ldap.py
@@ -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",