From 2792ae39ce31a267ff7c12dd3366eb41eaa45a34 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: Tue, 15 Nov 2016 15:58:13 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pym/server/utils/cl_server_backup.py | 47 ----------------------------
 pym/server/variables/server.py       |  2 +-
 pym/server/wsdl_server.py            |  1 -
 3 files changed, 1 insertion(+), 49 deletions(-)
 delete mode 100644 pym/server/utils/cl_server_backup.py

diff --git a/pym/server/utils/cl_server_backup.py b/pym/server/utils/cl_server_backup.py
deleted file mode 100644
index 2498b96..0000000
--- a/pym/server/utils/cl_server_backup.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright 2016 Mir Calculate. http://www.calculate-linux.org
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-import sys
-from calculate.core.server.func import Action, Tasks
-from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate
-from calculate.lib.cl_template import TemplatesError
-from calculate.lib.utils.files import FilesError
-from ..server import ServerError
-
-_ = lambda x: x
-setLocalTranslate('cl_ldap3', sys.modules[__name__])
-__ = getLazyLocalTranslate(_)
-
-
-class ClServerBackupAction(Action):
-    """
-    Действие обновление конфигурационных файлов
-    """
-    # ошибки, которые отображаются без подробностей
-    native_error = (FilesError,
-                    TemplatesError,
-                    ServerError)
-
-    successMessage = __("SUCCESS")
-    failedMessage = __("FAILED")
-    interruptMessage = __("INTERRUPT")
-
-    # список задач для действия
-    tasks = [
-        {'name': 'test',
-         'message': 'test'
-        }
-    ]
diff --git a/pym/server/variables/server.py b/pym/server/variables/server.py
index f362fba..0c3d5da 100644
--- a/pym/server/variables/server.py
+++ b/pym/server/variables/server.py
@@ -33,7 +33,7 @@ class VariableClServerName(Variable):
         if value == 'unix' and self.Get('sr_ldap_set') != 'on':
             raise VariableError(
                 _("For Unix Accounts settings required "
-                  "at first to perform LDAP configuration"))
+                  "the configured LDAP server"))
 
 
 class VariableClServerEnvPath(Variable):
diff --git a/pym/server/wsdl_server.py b/pym/server/wsdl_server.py
index d382a60..9a6f3c3 100644
--- a/pym/server/wsdl_server.py
+++ b/pym/server/wsdl_server.py
@@ -21,7 +21,6 @@ from calculate.lib.datavars import VariableError, DataVarsError
 from calculate.core.server.func import WsdlBase
 from .server import Server, ServerError
 from .variables.action import Actions as ServerActions
-from utils.cl_server_backup import ClServerBackupAction
 
 _ = lambda x: x
 from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate