From 8056e8178206f4e1bcf4370919cdf6dc7d19e85f Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Fri, 11 Mar 2011 15:16:55 +0300 Subject: [PATCH] Rename ldap variables. --- pym/cl_ldap_api.py | 4 ++-- pym/cl_vars_ldap.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pym/cl_ldap_api.py b/pym/cl_ldap_api.py index fe24717..f3bf5e0 100644 --- a/pym/cl_ldap_api.py +++ b/pym/cl_ldap_api.py @@ -246,7 +246,7 @@ class internalMethods(abs_api_service, shareVars, Template): def apply_templates(self): '''Apply package templates''' if self.is_setup(): - self.clVars.Set("cl_ldap_update_action","up", force=True) + self.clVars.Set("ac_ldap_update","up", force=True) return Template.applyTemplates(self) return True @@ -407,7 +407,7 @@ class allMethods(Singleton, internalMethods, shareldap): os.remove(ldapFile) self.clVars.Write("sr_ldap_set", "off",force=True) self.clVars.Set("sr_ldap_set", "on", force=True) - self.clVars.Set("cl_ldap_setup_action","up", force=True) + self.clVars.Set("ac_ldap_setup","up", force=True) # Первый проход self.clVars.Set("cl_pass_step", "1", True) if self.applyTemplates() is False: diff --git a/pym/cl_vars_ldap.py b/pym/cl_vars_ldap.py index b2067f0..adf371e 100644 --- a/pym/cl_vars_ldap.py +++ b/pym/cl_vars_ldap.py @@ -75,10 +75,10 @@ class Data: cl_ver = {'value':__version__} # действие программа устанавливает сервис - cl_ldap_setup_action = {'value':'down'} + ac_ldap_setup = {'value':'down'} # действие программа обновляет конфигурационные файлы - cl_ldap_update_action = {'value':'down'} + ac_ldap_update = {'value':'down'} # include строки в slapd.conf ld_ldap_scheme_conf = {'value':\