|
|
|
@ -58,8 +58,8 @@ def adminConnectLdap(fun):
|
|
|
|
if not self.getLdapObjInFile():
|
|
|
|
if not self.getLdapObjInFile():
|
|
|
|
flagError = True
|
|
|
|
flagError = True
|
|
|
|
if not self.baseDN:
|
|
|
|
if not self.baseDN:
|
|
|
|
if self.clVars.defined("soft_ldap_base"):
|
|
|
|
if self.clVars.defined("ld_base_dn"):
|
|
|
|
self.baseDN = self.clVars.Get("soft_ldap_base")
|
|
|
|
self.baseDN = self.clVars.Get("ld_base_dn")
|
|
|
|
if not self.baseDN:
|
|
|
|
if not self.baseDN:
|
|
|
|
self.printERROR (_('Not found LDAP base DN'))
|
|
|
|
self.printERROR (_('Not found LDAP base DN'))
|
|
|
|
if flagError:
|
|
|
|
if flagError:
|
|
|
|
@ -195,7 +195,7 @@ class shareLdap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
strUid = resPasswd.split(":")[2]
|
|
|
|
strUid = resPasswd.split(":")[2]
|
|
|
|
if strUid:
|
|
|
|
if strUid:
|
|
|
|
delBackDir =\
|
|
|
|
delBackDir =\
|
|
|
|
os.path.join(self.clVars.Get("soft_ldap_delete_user_dir"),
|
|
|
|
os.path.join(self.clVars.Get("sr_deleted_path"),
|
|
|
|
"%s-%s"%(userName,strUid),
|
|
|
|
"%s-%s"%(userName,strUid),
|
|
|
|
service)
|
|
|
|
service)
|
|
|
|
if strUid and os.path.exists(delBackDir) and os.listdir(delBackDir):
|
|
|
|
if strUid and os.path.exists(delBackDir) and os.listdir(delBackDir):
|
|
|
|
@ -234,7 +234,7 @@ class shareLdap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
strUid = searchUnixUser[0][0][1]['uidNumber'][0]
|
|
|
|
strUid = searchUnixUser[0][0][1]['uidNumber'][0]
|
|
|
|
if strUid:
|
|
|
|
if strUid:
|
|
|
|
delBackDir =\
|
|
|
|
delBackDir =\
|
|
|
|
os.path.join(self.clVars.Get("soft_ldap_delete_user_dir"),
|
|
|
|
os.path.join(self.clVars.Get("sr_deleted_path"),
|
|
|
|
"%s-%s"%(userName,strUid),
|
|
|
|
"%s-%s"%(userName,strUid),
|
|
|
|
service)
|
|
|
|
service)
|
|
|
|
if os.path.exists(delBackDir) and os.listdir(delBackDir):
|
|
|
|
if os.path.exists(delBackDir) and os.listdir(delBackDir):
|
|
|
|
@ -245,19 +245,19 @@ class shareLdap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
delBackDir =\
|
|
|
|
delBackDir =\
|
|
|
|
os.path.join(self.clVars.Get("soft_ldap_delete_user_dir"),
|
|
|
|
os.path.join(self.clVars.Get("sr_deleted_path"),
|
|
|
|
"%s"%(userName),
|
|
|
|
"%s"%(userName),
|
|
|
|
service)
|
|
|
|
service)
|
|
|
|
i = 0
|
|
|
|
i = 0
|
|
|
|
while os.path.exists(delBackDir):
|
|
|
|
while os.path.exists(delBackDir):
|
|
|
|
i += 1
|
|
|
|
i += 1
|
|
|
|
delBackDir =\
|
|
|
|
delBackDir =\
|
|
|
|
os.path.join(self.clVars.Get("soft_ldap_delete_user_dir"),
|
|
|
|
os.path.join(self.clVars.Get("sr_deleted_path"),
|
|
|
|
"%s_%s"%(userName,i),
|
|
|
|
"%s_%s"%(userName,i),
|
|
|
|
service)
|
|
|
|
service)
|
|
|
|
# Cоздаем директорию хранения удаленных пользователей
|
|
|
|
# Cоздаем директорию хранения удаленных пользователей
|
|
|
|
if not os.path.exists(self.clVars.Get("soft_ldap_delete_user_dir")):
|
|
|
|
if not os.path.exists(self.clVars.Get("sr_deleted_path")):
|
|
|
|
os.makedirs(self.clVars.Get("soft_ldap_delete_user_dir"))
|
|
|
|
os.makedirs(self.clVars.Get("sr_deleted_path"))
|
|
|
|
#Делаем сохранение директории
|
|
|
|
#Делаем сохранение директории
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
self.copyDir(delBackDir,srcDir)
|
|
|
|
self.copyDir(delBackDir,srcDir)
|
|
|
|
@ -338,7 +338,7 @@ class shareLdap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
def getALLServices(self):
|
|
|
|
def getALLServices(self):
|
|
|
|
"""Получаем все сервисы которые описаны в профилях"""
|
|
|
|
"""Получаем все сервисы которые описаны в профилях"""
|
|
|
|
# путь к директории профилей
|
|
|
|
# путь к директории профилей
|
|
|
|
profilePath = self.clVars.Get("setup_path_profinstall")[0]
|
|
|
|
profilePath = self.clVars.Get("cl_profile_path")[-1]
|
|
|
|
data = os.listdir(profilePath)
|
|
|
|
data = os.listdir(profilePath)
|
|
|
|
service = []
|
|
|
|
service = []
|
|
|
|
for fileData in data:
|
|
|
|
for fileData in data:
|
|
|
|
@ -597,7 +597,7 @@ class shareLdap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
def createUserDir(self, uid, gid, userDir, mode=0700):
|
|
|
|
def createUserDir(self, uid, gid, userDir, mode=0700):
|
|
|
|
"""Создание пользовательской директории для почты"""
|
|
|
|
"""Создание пользовательской директории"""
|
|
|
|
if not os.path.exists(userDir):
|
|
|
|
if not os.path.exists(userDir):
|
|
|
|
os.makedirs(userDir)
|
|
|
|
os.makedirs(userDir)
|
|
|
|
if mode:
|
|
|
|
if mode:
|
|
|
|
@ -1226,7 +1226,7 @@ class servUnix(shareLdap):
|
|
|
|
_("group name %s is found in Unix service") %\
|
|
|
|
_("group name %s is found in Unix service") %\
|
|
|
|
str(groupName) + " ...")
|
|
|
|
str(groupName) + " ...")
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
self.clVars.Set("soft_ldap_group_name",groupName)
|
|
|
|
self.clVars.Set("ur_group",groupName)
|
|
|
|
# номер группы
|
|
|
|
# номер группы
|
|
|
|
gid = str(self.getMaxGid())
|
|
|
|
gid = str(self.getMaxGid())
|
|
|
|
if options.has_key('g'):
|
|
|
|
if options.has_key('g'):
|
|
|
|
@ -1242,12 +1242,12 @@ class servUnix(shareLdap):
|
|
|
|
if self.searchUnixGid(gid):
|
|
|
|
if self.searchUnixGid(gid):
|
|
|
|
self.printERROR(_("GID is found in Unix service") + " ...")
|
|
|
|
self.printERROR(_("GID is found in Unix service") + " ...")
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
self.clVars.Set("soft_ldap_group_id", gid)
|
|
|
|
self.clVars.Set("ur_group_id", gid)
|
|
|
|
# Коментарий к группе
|
|
|
|
# Коментарий к группе
|
|
|
|
gecos = self.groupGecos
|
|
|
|
gecos = self.groupGecos
|
|
|
|
if options.has_key('c'):
|
|
|
|
if options.has_key('c'):
|
|
|
|
gecos = options['c']
|
|
|
|
gecos = options['c']
|
|
|
|
self.clVars.Set("soft_ldap_group_desc",gecos)
|
|
|
|
self.clVars.Set("ur_group_comment",gecos)
|
|
|
|
|
|
|
|
|
|
|
|
ldifFile = self.ldifFileGroup
|
|
|
|
ldifFile = self.ldifFileGroup
|
|
|
|
groupLdif = self.createLdif(ldifFile)
|
|
|
|
groupLdif = self.createLdif(ldifFile)
|
|
|
|
@ -1270,7 +1270,7 @@ class servUnix(shareLdap):
|
|
|
|
def addMachineLdapServer(self, machineName, options):
|
|
|
|
def addMachineLdapServer(self, machineName, options):
|
|
|
|
"""Добавляет Unix машину в LDAP-сервер"""
|
|
|
|
"""Добавляет Unix машину в LDAP-сервер"""
|
|
|
|
machineLogin = machineName.replace('$','') + "$"
|
|
|
|
machineLogin = machineName.replace('$','') + "$"
|
|
|
|
groupName = self.clVars.Get('soft_ldap_machine_group_name')
|
|
|
|
groupName = self.clVars.Get('sr_samba_machine_group')
|
|
|
|
|
|
|
|
|
|
|
|
resSearch = self.searchUnixGroupName(groupName)
|
|
|
|
resSearch = self.searchUnixGroupName(groupName)
|
|
|
|
if resSearch:
|
|
|
|
if resSearch:
|
|
|
|
@ -1298,11 +1298,11 @@ class servUnix(shareLdap):
|
|
|
|
options = {'g':groupId,'c':self.groupCompGecos}
|
|
|
|
options = {'g':groupId,'c':self.groupCompGecos}
|
|
|
|
if not self.addGroupUnixServer(groupName, options):
|
|
|
|
if not self.addGroupUnixServer(groupName, options):
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
self.clVars.Set('soft_ldap_machine_login',machineLogin)
|
|
|
|
self.clVars.Set('sr_samba_machine_login',machineLogin)
|
|
|
|
# Находим последний добавленный id
|
|
|
|
# Находим последний добавленный id
|
|
|
|
userIdNumber = str(self.getMaxUid())
|
|
|
|
userIdNumber = str(self.getMaxUid())
|
|
|
|
self.clVars.Set('soft_ldap_machine_id',userIdNumber)
|
|
|
|
self.clVars.Set('sr_samba_machine_id',userIdNumber)
|
|
|
|
self.clVars.Set('soft_ldap_machine_gid',groupId)
|
|
|
|
self.clVars.Set('sr_samba_machine_gid',groupId)
|
|
|
|
ldifFile = self.ldifFileMachine
|
|
|
|
ldifFile = self.ldifFileMachine
|
|
|
|
userLdif = self.createLdif(ldifFile)
|
|
|
|
userLdif = self.createLdif(ldifFile)
|
|
|
|
if not self.ldapObj.getError():
|
|
|
|
if not self.ldapObj.getError():
|
|
|
|
@ -1311,7 +1311,6 @@ class servUnix(shareLdap):
|
|
|
|
if self.ldapObj.getError():
|
|
|
|
if self.ldapObj.getError():
|
|
|
|
print _("LDAP Error") + ": " + self.ldapObj.getError().strip()
|
|
|
|
print _("LDAP Error") + ": " + self.ldapObj.getError().strip()
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
#clVars.Write("soft_ldap_user_id",str(int(userId)+1))
|
|
|
|
|
|
|
|
self.printSUCCESS(_("Added machine") + "...")
|
|
|
|
self.printSUCCESS(_("Added machine") + "...")
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
@ -1326,7 +1325,7 @@ class servUnix(shareLdap):
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
# id нового пользователя
|
|
|
|
# id нового пользователя
|
|
|
|
userId = str(self.getMaxUid())
|
|
|
|
userId = str(self.getMaxUid())
|
|
|
|
self.clVars.Set("soft_ldap_user_login", userName)
|
|
|
|
self.clVars.Set("ur_name", userName)
|
|
|
|
baseDir = self.baseDir
|
|
|
|
baseDir = self.baseDir
|
|
|
|
# Базовая домашняя директория
|
|
|
|
# Базовая домашняя директория
|
|
|
|
if options.has_key('b'):
|
|
|
|
if options.has_key('b'):
|
|
|
|
@ -1341,23 +1340,23 @@ class servUnix(shareLdap):
|
|
|
|
homeDir = options['d']
|
|
|
|
homeDir = options['d']
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
homeDir = os.path.join(baseDir, userName)
|
|
|
|
homeDir = os.path.join(baseDir, userName)
|
|
|
|
self.clVars.Set("soft_ldap_user_home",homeDir)
|
|
|
|
self.clVars.Set("ur_home_path",homeDir)
|
|
|
|
|
|
|
|
|
|
|
|
fullNameUser = self.fullNameUser
|
|
|
|
fullNameUser = self.fullNameUser
|
|
|
|
# Полное имя пользователя
|
|
|
|
# Полное имя пользователя
|
|
|
|
if options.has_key('c'):
|
|
|
|
if options.has_key('c'):
|
|
|
|
fullNameUser = options['c']
|
|
|
|
fullNameUser = options['c']
|
|
|
|
self.clVars.Set("soft_ldap_user_full_name",fullNameUser)
|
|
|
|
self.clVars.Set("ur_fio",fullNameUser)
|
|
|
|
# По умолчанию пользователя не видно
|
|
|
|
# По умолчанию пользователя не видно
|
|
|
|
visible = '0'
|
|
|
|
visible = '0'
|
|
|
|
if options.has_key('v'):
|
|
|
|
if options.has_key('v'):
|
|
|
|
visible = '1'
|
|
|
|
visible = '1'
|
|
|
|
self.clVars.Set("soft_ldap_user_visible",visible)
|
|
|
|
self.clVars.Set("ur_visible",visible)
|
|
|
|
# Оболочка пользователя
|
|
|
|
# Оболочка пользователя
|
|
|
|
userShell = self.userShell
|
|
|
|
userShell = self.userShell
|
|
|
|
if options.has_key('s'):
|
|
|
|
if options.has_key('s'):
|
|
|
|
userShell = options['s']
|
|
|
|
userShell = options['s']
|
|
|
|
self.clVars.Set("soft_ldap_user_shell", userShell)
|
|
|
|
self.clVars.Set("ur_shell", userShell)
|
|
|
|
|
|
|
|
|
|
|
|
# id пользователя
|
|
|
|
# id пользователя
|
|
|
|
if options.has_key('u'):
|
|
|
|
if options.has_key('u'):
|
|
|
|
@ -1376,7 +1375,7 @@ class servUnix(shareLdap):
|
|
|
|
" /etc/passwd"+ " ...")
|
|
|
|
" /etc/passwd"+ " ...")
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
|
|
self.clVars.Set("soft_ldap_user_id",userId)
|
|
|
|
self.clVars.Set("ur_id",userId)
|
|
|
|
|
|
|
|
|
|
|
|
# Добавляем пользователя в группы (находим имена групп)
|
|
|
|
# Добавляем пользователя в группы (находим имена групп)
|
|
|
|
if options.has_key('G'):
|
|
|
|
if options.has_key('G'):
|
|
|
|
@ -1426,7 +1425,7 @@ class servUnix(shareLdap):
|
|
|
|
self.printERROR(_("ERROR") + ": " +\
|
|
|
|
self.printERROR(_("ERROR") + ": " +\
|
|
|
|
_("create crypto password"))
|
|
|
|
_("create crypto password"))
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
self.clVars.Set("soft_ldap_user_pw_hash",userPwdHash)
|
|
|
|
self.clVars.Set("ur_hash",userPwdHash)
|
|
|
|
# флаги добавления
|
|
|
|
# флаги добавления
|
|
|
|
flagAdd = {}
|
|
|
|
flagAdd = {}
|
|
|
|
# Добавление основной группы пользователя
|
|
|
|
# Добавление основной группы пользователя
|
|
|
|
@ -1446,7 +1445,7 @@ class servUnix(shareLdap):
|
|
|
|
flagAdd['group'] = flagAddGroup
|
|
|
|
flagAdd['group'] = flagAddGroup
|
|
|
|
if not flagAddGroup:
|
|
|
|
if not flagAddGroup:
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
self.clVars.Set("soft_ldap_user_gid", userGid)
|
|
|
|
self.clVars.Set("ur_gid", userGid)
|
|
|
|
|
|
|
|
|
|
|
|
ldifFile = self.ldifFileUser
|
|
|
|
ldifFile = self.ldifFileUser
|
|
|
|
userLdif = self.createLdif(ldifFile)
|
|
|
|
userLdif = self.createLdif(ldifFile)
|
|
|
|
@ -2143,12 +2142,12 @@ service"))
|
|
|
|
if options.has_key("f"):
|
|
|
|
if options.has_key("f"):
|
|
|
|
forceOptions = True
|
|
|
|
forceOptions = True
|
|
|
|
# В случае если сервер установлен
|
|
|
|
# В случае если сервер установлен
|
|
|
|
if self.clVars.Get("soft_unix_setup") == "yes" and\
|
|
|
|
if self.clVars.Get("sr_unix_set") == "on" and\
|
|
|
|
not forceOptions:
|
|
|
|
not forceOptions:
|
|
|
|
self.printWARNING (_("WARNING") + ": " +\
|
|
|
|
self.printWARNING (_("WARNING") + ": " +\
|
|
|
|
_("Unix service already configured")+ ".")
|
|
|
|
_("Unix service already configured")+ ".")
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
if not self.clVars.Get("soft_ldap_setup") == "yes":
|
|
|
|
if not self.clVars.Get("sr_ldap_set") == "on":
|
|
|
|
self.printERROR(_("LDAP service not setuped") +" ...")
|
|
|
|
self.printERROR(_("LDAP service not setuped") +" ...")
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
if not forceOptions:
|
|
|
|
if not forceOptions:
|
|
|
|
@ -2174,10 +2173,8 @@ service"))
|
|
|
|
bakupObj = servLdap()
|
|
|
|
bakupObj = servLdap()
|
|
|
|
bakupObj.backupServer()
|
|
|
|
bakupObj.backupServer()
|
|
|
|
# Имя устанавливаемого сервиса
|
|
|
|
# Имя устанавливаемого сервиса
|
|
|
|
self.clVars.Set("soft_ldap_setup_name","unix")
|
|
|
|
self.clVars.Set("cl_pass_service","unix")
|
|
|
|
self.clVars.Write("soft_unix_setup","no")
|
|
|
|
self.clVars.Write("sr_unix_set","off")
|
|
|
|
# Для тестовых целей устанавливаем директорию инсталяции
|
|
|
|
|
|
|
|
#clVars.Set("setup_path_install","/tmp/test1/")
|
|
|
|
|
|
|
|
# Cоздаем объект профиль устанавливая директорию ldap для
|
|
|
|
# Cоздаем объект профиль устанавливая директорию ldap для
|
|
|
|
# файлов профилей
|
|
|
|
# файлов профилей
|
|
|
|
if not self.applyProfilesFromService('unix'):
|
|
|
|
if not self.applyProfilesFromService('unix'):
|
|
|
|
@ -2217,10 +2214,10 @@ service"))
|
|
|
|
# Записываем данные администратора сервиса Unix
|
|
|
|
# Записываем данные администратора сервиса Unix
|
|
|
|
ldapParser = iniLdapParser()
|
|
|
|
ldapParser = iniLdapParser()
|
|
|
|
ldapParser.setVar("unix",
|
|
|
|
ldapParser.setVar("unix",
|
|
|
|
{"DN":self.clVars.Get("soft_ldap_admin_unix"),
|
|
|
|
{"DN":self.clVars.Get("ld_unix_dn"),
|
|
|
|
"PASS":self.clVars.Get("soft_ldap_admin_unixpw")})
|
|
|
|
"PASS":self.clVars.Get("ld_unix_pw")})
|
|
|
|
self.printOK(_("Unix service configured") +" ...")
|
|
|
|
self.printOK(_("Unix service configured") +" ...")
|
|
|
|
self.clVars.Write("soft_unix_setup","yes")
|
|
|
|
self.clVars.Write("sr_unix_set","on")
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
def setShadowLastChange(self, userName):
|
|
|
|
def setShadowLastChange(self, userName):
|
|
|
|
@ -2309,7 +2306,7 @@ class servMail(shareLdap):
|
|
|
|
" ...")
|
|
|
|
" ...")
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
#почтовая директория пользователя
|
|
|
|
#почтовая директория пользователя
|
|
|
|
mailDir = os.path.join(self.clVars.Get("soft_ldap_mail_path"),
|
|
|
|
mailDir = os.path.join(self.clVars.Get("sr_mail_path"),
|
|
|
|
userName)
|
|
|
|
userName)
|
|
|
|
if options.has_key('r'):
|
|
|
|
if options.has_key('r'):
|
|
|
|
backup = False
|
|
|
|
backup = False
|
|
|
|
@ -2632,8 +2629,8 @@ class servMail(shareLdap):
|
|
|
|
mail = altMail
|
|
|
|
mail = altMail
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
mail = "%s@%s.%s" %(altMail,
|
|
|
|
mail = "%s@%s.%s" %(altMail,
|
|
|
|
self.clVars.Get("net_host"),
|
|
|
|
self.clVars.Get("os_net_hostname"),
|
|
|
|
self.clVars.Get("sys_domain"))
|
|
|
|
self.clVars.Get("os_net_domain"))
|
|
|
|
if not primaryMail:
|
|
|
|
if not primaryMail:
|
|
|
|
primaryMail = mail
|
|
|
|
primaryMail = mail
|
|
|
|
if self.searchUserToMail(mail) or\
|
|
|
|
if self.searchUserToMail(mail) or\
|
|
|
|
@ -2680,8 +2677,8 @@ in Unix service ...") %str(primaryMail))
|
|
|
|
mail = altMail
|
|
|
|
mail = altMail
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
mail = "%s@%s.%s" %(altMail,
|
|
|
|
mail = "%s@%s.%s" %(altMail,
|
|
|
|
self.clVars.Get("net_host"),
|
|
|
|
self.clVars.Get("os_net_hostname"),
|
|
|
|
self.clVars.Get("sys_domain"))
|
|
|
|
self.clVars.Get("os_net_domain"))
|
|
|
|
if self.searchUserToMail(mail) or\
|
|
|
|
if self.searchUserToMail(mail) or\
|
|
|
|
self.searchGroupToMail(mail):
|
|
|
|
self.searchGroupToMail(mail):
|
|
|
|
self.printERROR(
|
|
|
|
self.printERROR(
|
|
|
|
@ -2695,20 +2692,20 @@ in Unix service ...") %str(primaryMail))
|
|
|
|
str(groupName) + " ...")
|
|
|
|
str(groupName) + " ...")
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
mail = "%s@%s.%s" %(groupName,
|
|
|
|
mail = "%s@%s.%s" %(groupName,
|
|
|
|
self.clVars.Get("net_host"),
|
|
|
|
self.clVars.Get("os_net_hostname"),
|
|
|
|
self.clVars.Get("sys_domain"))
|
|
|
|
self.clVars.Get("os_net_domain"))
|
|
|
|
if self.searchUserToMail(mail) or\
|
|
|
|
if self.searchUserToMail(mail) or\
|
|
|
|
self.searchGroupToMail(mail):
|
|
|
|
self.searchGroupToMail(mail):
|
|
|
|
self.printERROR(
|
|
|
|
self.printERROR(
|
|
|
|
_("Email address %s is found in Mail service")%\
|
|
|
|
_("Email address %s is found in Mail service")%\
|
|
|
|
str(mail) + " ...")
|
|
|
|
str(mail) + " ...")
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
self.clVars.Set("soft_ldap_group_name",groupName)
|
|
|
|
self.clVars.Set("ur_group",groupName)
|
|
|
|
# Комментарий к группе
|
|
|
|
# Комментарий к группе
|
|
|
|
groupGecos = self.servUnixObj.groupGecos
|
|
|
|
groupGecos = self.servUnixObj.groupGecos
|
|
|
|
if options.has_key('c'):
|
|
|
|
if options.has_key('c'):
|
|
|
|
groupGecos = options['c']
|
|
|
|
groupGecos = options['c']
|
|
|
|
self.clVars.Set("soft_ldap_group_desc",groupGecos)
|
|
|
|
self.clVars.Set("ur_group_comment",groupGecos)
|
|
|
|
ldifFile = self.ldifFileGroup
|
|
|
|
ldifFile = self.ldifFileGroup
|
|
|
|
groupRawLdif = self.createLdif(ldifFile)
|
|
|
|
groupRawLdif = self.createLdif(ldifFile)
|
|
|
|
if not groupRawLdif:
|
|
|
|
if not groupRawLdif:
|
|
|
|
@ -2785,8 +2782,8 @@ in Unix service ...") %str(primaryMail))
|
|
|
|
usersInGroup = res[0][0][1]['rfc822member']
|
|
|
|
usersInGroup = res[0][0][1]['rfc822member']
|
|
|
|
for userName in usersNames:
|
|
|
|
for userName in usersNames:
|
|
|
|
userMail = "%s@%s.%s" %(userName,
|
|
|
|
userMail = "%s@%s.%s" %(userName,
|
|
|
|
self.clVars.Get("net_host"),
|
|
|
|
self.clVars.Get("os_net_hostname"),
|
|
|
|
self.clVars.Get("sys_domain"))
|
|
|
|
self.clVars.Get("os_net_domain"))
|
|
|
|
if userMail in usersInGroup:
|
|
|
|
if userMail in usersInGroup:
|
|
|
|
findUsers.append(userName)
|
|
|
|
findUsers.append(userName)
|
|
|
|
return findUsers
|
|
|
|
return findUsers
|
|
|
|
@ -2835,7 +2832,7 @@ in Unix service ...") %str(primaryMail))
|
|
|
|
if flagError:
|
|
|
|
if flagError:
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
mailDir = os.path.join(self.clVars.Get("soft_ldap_mail_path"),
|
|
|
|
mailDir = os.path.join(self.clVars.Get("sr_mail_path"),
|
|
|
|
userName)
|
|
|
|
userName)
|
|
|
|
flagError = False
|
|
|
|
flagError = False
|
|
|
|
if not self.createUserDir(uid, gid, mailDir):
|
|
|
|
if not self.createUserDir(uid, gid, mailDir):
|
|
|
|
@ -2885,8 +2882,8 @@ in Unix service ...") %str(primaryMail))
|
|
|
|
modAttrs = []
|
|
|
|
modAttrs = []
|
|
|
|
for userName in addUsers:
|
|
|
|
for userName in addUsers:
|
|
|
|
userMail = "%s@%s.%s" %(userName,
|
|
|
|
userMail = "%s@%s.%s" %(userName,
|
|
|
|
self.clVars.Get("net_host"),
|
|
|
|
self.clVars.Get("os_net_hostname"),
|
|
|
|
self.clVars.Get("sys_domain"))
|
|
|
|
self.clVars.Get("os_net_domain"))
|
|
|
|
modAttrs.append((ldap.MOD_ADD, 'rfc822member', userMail))
|
|
|
|
modAttrs.append((ldap.MOD_ADD, 'rfc822member', userMail))
|
|
|
|
if modAttrs:
|
|
|
|
if modAttrs:
|
|
|
|
groupDN = self.addDN("cn="+groupName, self.relGroupsDN)
|
|
|
|
groupDN = self.addDN("cn="+groupName, self.relGroupsDN)
|
|
|
|
@ -2919,8 +2916,8 @@ in Unix service ...") %str(primaryMail))
|
|
|
|
mail = altMail
|
|
|
|
mail = altMail
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
mail = "%s@%s.%s" %(altMail,
|
|
|
|
mail = "%s@%s.%s" %(altMail,
|
|
|
|
self.clVars.Get("net_host"),
|
|
|
|
self.clVars.Get("os_net_hostname"),
|
|
|
|
self.clVars.Get("sys_domain"))
|
|
|
|
self.clVars.Get("os_net_domain"))
|
|
|
|
if not primaryMail:
|
|
|
|
if not primaryMail:
|
|
|
|
primaryMail = mail
|
|
|
|
primaryMail = mail
|
|
|
|
if self.searchUserToMail(mail) or\
|
|
|
|
if self.searchUserToMail(mail) or\
|
|
|
|
@ -2940,8 +2937,8 @@ in Unix service ...") %str(primaryMail))
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
mail = "%s@%s.%s" %(userName,
|
|
|
|
mail = "%s@%s.%s" %(userName,
|
|
|
|
self.clVars.Get("net_host"),
|
|
|
|
self.clVars.Get("os_net_hostname"),
|
|
|
|
self.clVars.Get("sys_domain"))
|
|
|
|
self.clVars.Get("os_net_domain"))
|
|
|
|
if self.searchUserToMail(mail) or\
|
|
|
|
if self.searchUserToMail(mail) or\
|
|
|
|
self.searchGroupToMail(mail):
|
|
|
|
self.searchGroupToMail(mail):
|
|
|
|
self.printERROR(
|
|
|
|
self.printERROR(
|
|
|
|
@ -2977,7 +2974,7 @@ in Unix service ...") %str(primaryMail))
|
|
|
|
_("User %s is not found in Unix service") % str(userName)+\
|
|
|
|
_("User %s is not found in Unix service") % str(userName)+\
|
|
|
|
" ...")
|
|
|
|
" ...")
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
self.clVars.Set("soft_ldap_user_login", userName)
|
|
|
|
self.clVars.Set("ur_name", userName)
|
|
|
|
#Полное имя пользователя
|
|
|
|
#Полное имя пользователя
|
|
|
|
fullNameUser = self.servUnixObj.fullNameUser
|
|
|
|
fullNameUser = self.servUnixObj.fullNameUser
|
|
|
|
if options.has_key('c'):
|
|
|
|
if options.has_key('c'):
|
|
|
|
@ -2985,7 +2982,7 @@ in Unix service ...") %str(primaryMail))
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
if resUnix and resUnix[0][0][1].has_key('cn'):
|
|
|
|
if resUnix and resUnix[0][0][1].has_key('cn'):
|
|
|
|
fullNameUser = resUnix[0][0][1]['cn'][0]
|
|
|
|
fullNameUser = resUnix[0][0][1]['cn'][0]
|
|
|
|
self.clVars.Set("soft_ldap_user_full_name",fullNameUser)
|
|
|
|
self.clVars.Set("ur_fio",fullNameUser)
|
|
|
|
if not userPwd:
|
|
|
|
if not userPwd:
|
|
|
|
userPwdHash = "crypt{xxx}"
|
|
|
|
userPwdHash = "crypt{xxx}"
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
@ -2997,7 +2994,7 @@ in Unix service ...") %str(primaryMail))
|
|
|
|
if flagCreateUnixUser:
|
|
|
|
if flagCreateUnixUser:
|
|
|
|
self.servUnixObj.delUserUnixServer(userName, {}, False, False)
|
|
|
|
self.servUnixObj.delUserUnixServer(userName, {}, False, False)
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
self.clVars.Set("soft_ldap_user_pw_hash",userPwdHash)
|
|
|
|
self.clVars.Set("ur_hash",userPwdHash)
|
|
|
|
ldifFile = self.ldifFileUser
|
|
|
|
ldifFile = self.ldifFileUser
|
|
|
|
userRawLdif = self.createLdif(ldifFile)
|
|
|
|
userRawLdif = self.createLdif(ldifFile)
|
|
|
|
if not userRawLdif:
|
|
|
|
if not userRawLdif:
|
|
|
|
@ -3028,7 +3025,7 @@ in Unix service ...") %str(primaryMail))
|
|
|
|
if not flagError:
|
|
|
|
if not flagError:
|
|
|
|
# Востановим удаленного пользователя
|
|
|
|
# Востановим удаленного пользователя
|
|
|
|
# Почтовая директория пользователя
|
|
|
|
# Почтовая директория пользователя
|
|
|
|
mailDir = os.path.join(self.clVars.Get("soft_ldap_mail_path"),
|
|
|
|
mailDir = os.path.join(self.clVars.Get("sr_mail_path"),
|
|
|
|
userName)
|
|
|
|
userName)
|
|
|
|
message = _("Restored deleted user %s data")% userName + "\n" +\
|
|
|
|
message = _("Restored deleted user %s data")% userName + "\n" +\
|
|
|
|
_("(Y - yes, n - no, ctrl+c - cansel)")
|
|
|
|
_("(Y - yes, n - no, ctrl+c - cansel)")
|
|
|
|
@ -3074,7 +3071,7 @@ in Unix service ...") %str(primaryMail))
|
|
|
|
self.createClVars()
|
|
|
|
self.createClVars()
|
|
|
|
#self.clVars.printVars()
|
|
|
|
#self.clVars.printVars()
|
|
|
|
#return True
|
|
|
|
#return True
|
|
|
|
if self.clVars.Get("soft_unix_setup") != "yes":
|
|
|
|
if self.clVars.Get("sr_unix_set") != "on":
|
|
|
|
self.printERROR (_("ERROR") + ": " +\
|
|
|
|
self.printERROR (_("ERROR") + ": " +\
|
|
|
|
_("LDAP server is not configured")+ ".")
|
|
|
|
_("LDAP server is not configured")+ ".")
|
|
|
|
self.printWARNING(_("Unix service is not setuped"))
|
|
|
|
self.printWARNING(_("Unix service is not setuped"))
|
|
|
|
@ -3082,7 +3079,7 @@ in Unix service ...") %str(primaryMail))
|
|
|
|
self.printWARNING(" cl-setup unix")
|
|
|
|
self.printWARNING(" cl-setup unix")
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
# В случае если сервер установлен
|
|
|
|
# В случае если сервер установлен
|
|
|
|
if self.clVars.Get("soft_mail_setup") == "yes" and\
|
|
|
|
if self.clVars.Get("sr_mail_set") == "on" and\
|
|
|
|
not forceOptions:
|
|
|
|
not forceOptions:
|
|
|
|
self.printWARNING (_("WARNING") + ": " +\
|
|
|
|
self.printWARNING (_("WARNING") + ": " +\
|
|
|
|
_("Mail server is configured")+ ".")
|
|
|
|
_("Mail server is configured")+ ".")
|
|
|
|
@ -3120,8 +3117,8 @@ in Unix service ...") %str(primaryMail))
|
|
|
|
if not self.stopServices(["mail"]):
|
|
|
|
if not self.stopServices(["mail"]):
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
# Имя устанавливаемого сервиса
|
|
|
|
# Имя устанавливаемого сервиса
|
|
|
|
self.clVars.Set("soft_ldap_setup_name","mail")
|
|
|
|
self.clVars.Set("cl_pass_service","mail")
|
|
|
|
self.clVars.Write("soft_mail_setup","no")
|
|
|
|
self.clVars.Write("sr_mail_set","off")
|
|
|
|
# Cоздаем объект профиль устанавливая директорию mail для
|
|
|
|
# Cоздаем объект профиль устанавливая директорию mail для
|
|
|
|
# файлов профилей
|
|
|
|
# файлов профилей
|
|
|
|
if not self.applyProfilesFromService('mail'):
|
|
|
|
if not self.applyProfilesFromService('mail'):
|
|
|
|
@ -3161,8 +3158,8 @@ in Unix service ...") %str(primaryMail))
|
|
|
|
# Записываем данные администратора сервиса Mail
|
|
|
|
# Записываем данные администратора сервиса Mail
|
|
|
|
ldapParser = iniLdapParser()
|
|
|
|
ldapParser = iniLdapParser()
|
|
|
|
ldapParser.setVar("mail",
|
|
|
|
ldapParser.setVar("mail",
|
|
|
|
{"DN":self.clVars.Get("soft_ldap_admin_mail"),
|
|
|
|
{"DN":self.clVars.Get("ld_mail_dn"),
|
|
|
|
"PASS":self.clVars.Get("soft_ldap_admin_mailpw")})
|
|
|
|
"PASS":self.clVars.Get("ld_mail_pw")})
|
|
|
|
self.printOK(_("Added ldif file") +" ...")
|
|
|
|
self.printOK(_("Added ldif file") +" ...")
|
|
|
|
textLine = self.execProg("newaliases")
|
|
|
|
textLine = self.execProg("newaliases")
|
|
|
|
if not (textLine == None):
|
|
|
|
if not (textLine == None):
|
|
|
|
@ -3186,7 +3183,7 @@ in Unix service ...") %str(primaryMail))
|
|
|
|
# Устанавливаем автозапуск демона
|
|
|
|
# Устанавливаем автозапуск демона
|
|
|
|
if not self.setDaemonAutostart("dovecot"):
|
|
|
|
if not self.setDaemonAutostart("dovecot"):
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
self.clVars.Write("soft_mail_setup","yes")
|
|
|
|
self.clVars.Write("sr_mail_set","on")
|
|
|
|
self.printOK(_("Mail service configured") + " ...")
|
|
|
|
self.printOK(_("Mail service configured") + " ...")
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
@ -3606,12 +3603,12 @@ class servJabber(shareLdap):
|
|
|
|
_("group name %s is found in Jabber service") %\
|
|
|
|
_("group name %s is found in Jabber service") %\
|
|
|
|
str(groupName) + " ...")
|
|
|
|
str(groupName) + " ...")
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
self.clVars.Set("soft_ldap_group_name",groupName)
|
|
|
|
self.clVars.Set("ur_group",groupName)
|
|
|
|
# Комментарий к группе
|
|
|
|
# Комментарий к группе
|
|
|
|
groupGecos = self.servUnixObj.groupGecos
|
|
|
|
groupGecos = self.servUnixObj.groupGecos
|
|
|
|
if options.has_key('c'):
|
|
|
|
if options.has_key('c'):
|
|
|
|
groupGecos = options['c']
|
|
|
|
groupGecos = options['c']
|
|
|
|
self.clVars.Set("soft_ldap_group_desc",groupGecos)
|
|
|
|
self.clVars.Set("ur_group_comment",groupGecos)
|
|
|
|
ldifFile = self.ldifFileGroup
|
|
|
|
ldifFile = self.ldifFileGroup
|
|
|
|
groupLdif = self.createLdif(ldifFile)
|
|
|
|
groupLdif = self.createLdif(ldifFile)
|
|
|
|
if not groupLdif:
|
|
|
|
if not groupLdif:
|
|
|
|
@ -3631,8 +3628,8 @@ class servJabber(shareLdap):
|
|
|
|
"""Добавляет jabber пользователя"""
|
|
|
|
"""Добавляет jabber пользователя"""
|
|
|
|
#jabber id
|
|
|
|
#jabber id
|
|
|
|
jabberId = "%s@%s.%s" %(userName,
|
|
|
|
jabberId = "%s@%s.%s" %(userName,
|
|
|
|
self.clVars.Get("net_host"),
|
|
|
|
self.clVars.Get("os_net_hostname"),
|
|
|
|
self.clVars.Get("sys_domain"))
|
|
|
|
self.clVars.Get("os_net_domain"))
|
|
|
|
if self.searchUserToId(jabberId):
|
|
|
|
if self.searchUserToId(jabberId):
|
|
|
|
self.printERROR(_("User exists in Jabber service"))
|
|
|
|
self.printERROR(_("User exists in Jabber service"))
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
@ -3642,13 +3639,13 @@ class servJabber(shareLdap):
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
if not userPwd:
|
|
|
|
if not userPwd:
|
|
|
|
userPwd = "crypt{xxx}"
|
|
|
|
userPwd = "crypt{xxx}"
|
|
|
|
self.clVars.Set("soft_ldap_user_pw_hash",userPwd)
|
|
|
|
self.clVars.Set("ur_hash",userPwd)
|
|
|
|
self.clVars.Set("soft_ldap_user_login", userName)
|
|
|
|
self.clVars.Set("ur_name", userName)
|
|
|
|
#Полное имя пользователя
|
|
|
|
#Полное имя пользователя
|
|
|
|
fullNameUser = self.servUnixObj.fullNameUser
|
|
|
|
fullNameUser = self.servUnixObj.fullNameUser
|
|
|
|
if options.has_key('c'):
|
|
|
|
if options.has_key('c'):
|
|
|
|
fullNameUser = options['c']
|
|
|
|
fullNameUser = options['c']
|
|
|
|
self.clVars.Set("soft_ldap_user_full_name",fullNameUser)
|
|
|
|
self.clVars.Set("ur_fio",fullNameUser)
|
|
|
|
ldifFile = self.ldifFileUser
|
|
|
|
ldifFile = self.ldifFileUser
|
|
|
|
userLdif = self.createLdif(ldifFile)
|
|
|
|
userLdif = self.createLdif(ldifFile)
|
|
|
|
if not self.ldapObj.getError():
|
|
|
|
if not self.ldapObj.getError():
|
|
|
|
@ -3680,7 +3677,7 @@ class servJabber(shareLdap):
|
|
|
|
self.createClVars()
|
|
|
|
self.createClVars()
|
|
|
|
#self.clVars.printVars()
|
|
|
|
#self.clVars.printVars()
|
|
|
|
#return True
|
|
|
|
#return True
|
|
|
|
if self.clVars.Get("soft_ldap_setup") != "yes":
|
|
|
|
if self.clVars.Get("sr_ldap_set") != "on":
|
|
|
|
self.printERROR (_("ERROR") + ": " +\
|
|
|
|
self.printERROR (_("ERROR") + ": " +\
|
|
|
|
_("LDAP server is not configured")+ ".")
|
|
|
|
_("LDAP server is not configured")+ ".")
|
|
|
|
self.printWARNING(_("LDAP service is not setuped"))
|
|
|
|
self.printWARNING(_("LDAP service is not setuped"))
|
|
|
|
@ -3688,7 +3685,7 @@ class servJabber(shareLdap):
|
|
|
|
self.printWARNING(" cl-setup ldap")
|
|
|
|
self.printWARNING(" cl-setup ldap")
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
# В случае если сервер установлен
|
|
|
|
# В случае если сервер установлен
|
|
|
|
if self.clVars.Get("soft_jabber_setup") == "yes" and\
|
|
|
|
if self.clVars.Get("sr_jabber_set") == "on" and\
|
|
|
|
not forceOptions:
|
|
|
|
not forceOptions:
|
|
|
|
self.printWARNING (_("WARNING") + ": " +\
|
|
|
|
self.printWARNING (_("WARNING") + ": " +\
|
|
|
|
_("Jabber server is configured")+ ".")
|
|
|
|
_("Jabber server is configured")+ ".")
|
|
|
|
@ -3723,8 +3720,8 @@ class servJabber(shareLdap):
|
|
|
|
if not self.stopServices(["jabber"]):
|
|
|
|
if not self.stopServices(["jabber"]):
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
# Имя устанавливаемого сервиса
|
|
|
|
# Имя устанавливаемого сервиса
|
|
|
|
self.clVars.Set("soft_ldap_setup_name","jabber")
|
|
|
|
self.clVars.Set("cl_pass_service","jabber")
|
|
|
|
self.clVars.Write("soft_jabber_setup","no")
|
|
|
|
self.clVars.Write("sr_jabber_set","off")
|
|
|
|
# Cоздаем объект профиль устанавливая директорию jabber для
|
|
|
|
# Cоздаем объект профиль устанавливая директорию jabber для
|
|
|
|
# файлов профилей
|
|
|
|
# файлов профилей
|
|
|
|
if not self.applyProfilesFromService('jabber'):
|
|
|
|
if not self.applyProfilesFromService('jabber'):
|
|
|
|
@ -3764,16 +3761,16 @@ class servJabber(shareLdap):
|
|
|
|
# Администратор сервиса
|
|
|
|
# Администратор сервиса
|
|
|
|
adminName = "admin"
|
|
|
|
adminName = "admin"
|
|
|
|
adminFullName = "%s@%s.%s" %(adminName,
|
|
|
|
adminFullName = "%s@%s.%s" %(adminName,
|
|
|
|
self.clVars.Get("net_host"),
|
|
|
|
self.clVars.Get("os_net_hostname"),
|
|
|
|
self.clVars.Get("sys_domain"))
|
|
|
|
self.clVars.Get("os_net_domain"))
|
|
|
|
print _("Enter the %s password" % adminFullName)
|
|
|
|
print _("Enter the %s password" % adminFullName)
|
|
|
|
if not self.addUserJabberServer(adminName,{'p':""}):
|
|
|
|
if not self.addUserJabberServer(adminName,{'p':""}):
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
# Записываем данные администратора сервиса Jabber
|
|
|
|
# Записываем данные администратора сервиса Jabber
|
|
|
|
ldapParser = iniLdapParser()
|
|
|
|
ldapParser = iniLdapParser()
|
|
|
|
ldapParser.setVar("jabber",
|
|
|
|
ldapParser.setVar("jabber",
|
|
|
|
{"DN":self.clVars.Get("soft_ldap_admin_jabber"),
|
|
|
|
{"DN":self.clVars.Get("ld_jabber_dn"),
|
|
|
|
"PASS":self.clVars.Get("soft_ldap_admin_jabberpw")})
|
|
|
|
"PASS":self.clVars.Get("ld_jabber_pw")})
|
|
|
|
self.printOK(_("Added ldif file") +" ...")
|
|
|
|
self.printOK(_("Added ldif file") +" ...")
|
|
|
|
# создаем сертификат если есть используем прежний
|
|
|
|
# создаем сертификат если есть используем прежний
|
|
|
|
self.execProg("/bin/bash /etc/jabber/self-cert.sh")
|
|
|
|
self.execProg("/bin/bash /etc/jabber/self-cert.sh")
|
|
|
|
@ -3789,7 +3786,7 @@ class servJabber(shareLdap):
|
|
|
|
# Устанавливаем автозапуск демона
|
|
|
|
# Устанавливаем автозапуск демона
|
|
|
|
if not self.setDaemonAutostart("ejabberd"):
|
|
|
|
if not self.setDaemonAutostart("ejabberd"):
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
self.clVars.Write("soft_jabber_setup","yes")
|
|
|
|
self.clVars.Write("sr_jabber_set","on")
|
|
|
|
self.printOK(_("Jabber service configured") + " ...")
|
|
|
|
self.printOK(_("Jabber service configured") + " ...")
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
@ -3841,16 +3838,16 @@ class servSamba(shareLdap):
|
|
|
|
str(delUser))
|
|
|
|
str(delUser))
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
winProfDir =\
|
|
|
|
winProfDir =\
|
|
|
|
os.path.join(self.clVars.Get("soft_samba_winprofile_path"),
|
|
|
|
os.path.join(self.clVars.Get("sr_samba_winprof_path"),
|
|
|
|
userName)
|
|
|
|
userName)
|
|
|
|
linProfDir =\
|
|
|
|
linProfDir =\
|
|
|
|
os.path.join(self.clVars.Get("soft_samba_linprofile_path"),
|
|
|
|
os.path.join(self.clVars.Get("sr_samba_linprof_path"),
|
|
|
|
userName)
|
|
|
|
userName)
|
|
|
|
userHomeDir =\
|
|
|
|
userHomeDir =\
|
|
|
|
os.path.join(self.clVars.Get("soft_samba_home_path"),
|
|
|
|
os.path.join(self.clVars.Get("sr_samba_home_path"),
|
|
|
|
userName)
|
|
|
|
userName)
|
|
|
|
userNetlogonDir =\
|
|
|
|
userNetlogonDir =\
|
|
|
|
os.path.join(self.clVars.Get("soft_samba_winlogon_path"),
|
|
|
|
os.path.join(self.clVars.Get("sr_samba_winlogon_path"),
|
|
|
|
userName)
|
|
|
|
userName)
|
|
|
|
if options.has_key('r'):
|
|
|
|
if options.has_key('r'):
|
|
|
|
backup = False
|
|
|
|
backup = False
|
|
|
|
@ -3964,16 +3961,16 @@ class servSamba(shareLdap):
|
|
|
|
if "Added" in str(textLine):
|
|
|
|
if "Added" in str(textLine):
|
|
|
|
flagError = False
|
|
|
|
flagError = False
|
|
|
|
winProfDir =\
|
|
|
|
winProfDir =\
|
|
|
|
os.path.join(self.clVars.Get("soft_samba_winprofile_path"),
|
|
|
|
os.path.join(self.clVars.Get("sr_samba_winprof_path"),
|
|
|
|
userName)
|
|
|
|
userName)
|
|
|
|
linProfDir =\
|
|
|
|
linProfDir =\
|
|
|
|
os.path.join(self.clVars.Get("soft_samba_linprofile_path"),
|
|
|
|
os.path.join(self.clVars.Get("sr_samba_linprof_path"),
|
|
|
|
userName)
|
|
|
|
userName)
|
|
|
|
userHomeDir =\
|
|
|
|
userHomeDir =\
|
|
|
|
os.path.join(self.clVars.Get("soft_samba_home_path"),
|
|
|
|
os.path.join(self.clVars.Get("sr_samba_home_path"),
|
|
|
|
userName)
|
|
|
|
userName)
|
|
|
|
userNetlogonDir =\
|
|
|
|
userNetlogonDir =\
|
|
|
|
os.path.join(self.clVars.Get("soft_samba_winlogon_path"),
|
|
|
|
os.path.join(self.clVars.Get("sr_samba_winlogon_path"),
|
|
|
|
userName)
|
|
|
|
userName)
|
|
|
|
message = _("Restored deleted user %s")% userName + "\n" +\
|
|
|
|
message = _("Restored deleted user %s")% userName + "\n" +\
|
|
|
|
_("(Y - yes, n - no, ctrl+c - cansel)")
|
|
|
|
_("(Y - yes, n - no, ctrl+c - cansel)")
|
|
|
|
@ -4144,7 +4141,7 @@ class servSamba(shareLdap):
|
|
|
|
self.createClVars()
|
|
|
|
self.createClVars()
|
|
|
|
if options.has_key("f"):
|
|
|
|
if options.has_key("f"):
|
|
|
|
forceOptions = True
|
|
|
|
forceOptions = True
|
|
|
|
if self.clVars.Get("soft_unix_setup") != "yes":
|
|
|
|
if self.clVars.Get("sr_unix_set") != "on":
|
|
|
|
self.printERROR (_("ERROR") + ": " +\
|
|
|
|
self.printERROR (_("ERROR") + ": " +\
|
|
|
|
_("LDAP server is not configured")+ ".")
|
|
|
|
_("LDAP server is not configured")+ ".")
|
|
|
|
self.printWARNING(_("Unix service is not setuped"))
|
|
|
|
self.printWARNING(_("Unix service is not setuped"))
|
|
|
|
@ -4152,7 +4149,7 @@ class servSamba(shareLdap):
|
|
|
|
self.printWARNING(" cl-setup unix")
|
|
|
|
self.printWARNING(" cl-setup unix")
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
# В случае если сервер установлен
|
|
|
|
# В случае если сервер установлен
|
|
|
|
if self.clVars.Get("soft_samba_setup") == "yes" and\
|
|
|
|
if self.clVars.Get("sr_samba_set") == "on" and\
|
|
|
|
not forceOptions:
|
|
|
|
not forceOptions:
|
|
|
|
self.printWARNING (_("WARNING") + ": " +\
|
|
|
|
self.printWARNING (_("WARNING") + ": " +\
|
|
|
|
_("Samba server is configured")+ ".")
|
|
|
|
_("Samba server is configured")+ ".")
|
|
|
|
@ -4186,8 +4183,8 @@ class servSamba(shareLdap):
|
|
|
|
if not self.stopServices(["samba"]):
|
|
|
|
if not self.stopServices(["samba"]):
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
# Имя устанавливаемого сервиса
|
|
|
|
# Имя устанавливаемого сервиса
|
|
|
|
self.clVars.Set("soft_ldap_setup_name","samba")
|
|
|
|
self.clVars.Set("cl_pass_service","samba")
|
|
|
|
self.clVars.Write("soft_samba_setup","no")
|
|
|
|
self.clVars.Write("sr_samba_set","off")
|
|
|
|
# Cоздаем объект профиль устанавливая директорию samba для
|
|
|
|
# Cоздаем объект профиль устанавливая директорию samba для
|
|
|
|
# файлов профилей
|
|
|
|
# файлов профилей
|
|
|
|
if not self.applyProfilesFromService('samba'):
|
|
|
|
if not self.applyProfilesFromService('samba'):
|
|
|
|
@ -4203,8 +4200,8 @@ class servSamba(shareLdap):
|
|
|
|
# Записываем данные администратора сервиса Samba
|
|
|
|
# Записываем данные администратора сервиса Samba
|
|
|
|
ldapParser = iniLdapParser()
|
|
|
|
ldapParser = iniLdapParser()
|
|
|
|
ldapParser.setVar("samba",
|
|
|
|
ldapParser.setVar("samba",
|
|
|
|
{"DN":self.clVars.Get("soft_ldap_admin_samba"),
|
|
|
|
{"DN":self.clVars.Get("ld_samba_dn"),
|
|
|
|
"PASS":self.clVars.Get("soft_ldap_admin_sambapw")})
|
|
|
|
"PASS":self.clVars.Get("ld_samba_pw")})
|
|
|
|
ldapParser = iniLdapParser()
|
|
|
|
ldapParser = iniLdapParser()
|
|
|
|
pswd = ldapParser.getVar("samba","PASS")
|
|
|
|
pswd = ldapParser.getVar("samba","PASS")
|
|
|
|
if not pswd:
|
|
|
|
if not pswd:
|
|
|
|
@ -4258,7 +4255,7 @@ class servSamba(shareLdap):
|
|
|
|
# Устанавливаем автозапуск демона
|
|
|
|
# Устанавливаем автозапуск демона
|
|
|
|
if not self.setDaemonAutostart("samba"):
|
|
|
|
if not self.setDaemonAutostart("samba"):
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
self.clVars.Write("soft_samba_setup","yes")
|
|
|
|
self.clVars.Write("sr_samba_set","on")
|
|
|
|
self.printOK(_("Samba service configured") + " ...")
|
|
|
|
self.printOK(_("Samba service configured") + " ...")
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
@ -4364,7 +4361,7 @@ class servLdap(shareLdap):
|
|
|
|
"/usr/lib/calculate/calculate-server/ldif/ldap_base.ldif"
|
|
|
|
"/usr/lib/calculate/calculate-server/ldif/ldap_base.ldif"
|
|
|
|
# Для backup
|
|
|
|
# Для backup
|
|
|
|
# Директория куда будет сохранен архив
|
|
|
|
# Директория куда будет сохранен архив
|
|
|
|
self.backupDirectory = "/var/calculate/backup/LDAP"
|
|
|
|
self.backupDirectory = "/var/calculate/server-backup/ldap"
|
|
|
|
# ldif файл базы LDAP
|
|
|
|
# ldif файл базы LDAP
|
|
|
|
self.archLdifFile = "/tmp/LDAP_DATABASE.ldif"
|
|
|
|
self.archLdifFile = "/tmp/LDAP_DATABASE.ldif"
|
|
|
|
# приватная директория Samba
|
|
|
|
# приватная директория Samba
|
|
|
|
@ -4396,28 +4393,39 @@ class servLdap(shareLdap):
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
servicePaths = []
|
|
|
|
servicePaths = []
|
|
|
|
servInstalled = []
|
|
|
|
servInstalled = []
|
|
|
|
# путь к директории профилей
|
|
|
|
# пути к директориям профилей
|
|
|
|
profilePath = self.clVars.Get("setup_path_profinstall")[0]
|
|
|
|
profilePaths = self.clVars.Get("cl_profile_path")
|
|
|
|
if self.clVars.Get("soft_ldap_setup") == "yes":
|
|
|
|
for profilePath in profilePaths:
|
|
|
|
serv = "ldap"
|
|
|
|
if self.clVars.Get("sr_ldap_set") == "on":
|
|
|
|
servicePaths.append(os.path.join(profilePath,serv))
|
|
|
|
serv = "ldap"
|
|
|
|
servInstalled.append(serv)
|
|
|
|
servPath = os.path.join(profilePath,serv)
|
|
|
|
if self.clVars.Get("soft_unix_setup") == "yes":
|
|
|
|
if os.path.exists(servPath):
|
|
|
|
serv = "unix"
|
|
|
|
servicePaths.append(servPath)
|
|
|
|
servicePaths.append(os.path.join(profilePath,serv))
|
|
|
|
servInstalled.append(serv)
|
|
|
|
servInstalled.append(serv)
|
|
|
|
if self.clVars.Get("sr_unix_set") == "on":
|
|
|
|
if self.clVars.Get("soft_samba_setup") == "yes":
|
|
|
|
serv = "unix"
|
|
|
|
serv = "samba"
|
|
|
|
servPath = os.path.join(profilePath,serv)
|
|
|
|
servicePaths.append(os.path.join(profilePath,serv))
|
|
|
|
if os.path.exists(servPath):
|
|
|
|
servInstalled.append(serv)
|
|
|
|
servicePaths.append(servPath)
|
|
|
|
if self.clVars.Get("soft_mail_setup") == "yes":
|
|
|
|
servInstalled.append(serv)
|
|
|
|
serv = "mail"
|
|
|
|
if self.clVars.Get("sr_samba_set") == "on":
|
|
|
|
servicePaths.append(os.path.join(profilePath,serv))
|
|
|
|
serv = "samba"
|
|
|
|
servInstalled.append(serv)
|
|
|
|
servPath = os.path.join(profilePath,serv)
|
|
|
|
if self.clVars.Get("soft_jabber_setup") == "yes":
|
|
|
|
if os.path.exists(servPath):
|
|
|
|
serv = "jabber"
|
|
|
|
servicePaths.append(servPath)
|
|
|
|
servicePaths.append(os.path.join(profilePath,serv))
|
|
|
|
servInstalled.append(serv)
|
|
|
|
servInstalled.append(serv)
|
|
|
|
if self.clVars.Get("sr_mail_set") == "on":
|
|
|
|
|
|
|
|
serv = "mail"
|
|
|
|
|
|
|
|
servPath = os.path.join(profilePath,serv)
|
|
|
|
|
|
|
|
if os.path.exists(servPath):
|
|
|
|
|
|
|
|
servicePaths.append(servPath)
|
|
|
|
|
|
|
|
servInstalled.append(serv)
|
|
|
|
|
|
|
|
if self.clVars.Get("sr_jabber_set") == "on":
|
|
|
|
|
|
|
|
serv = "jabber"
|
|
|
|
|
|
|
|
servPath = os.path.join(profilePath,serv)
|
|
|
|
|
|
|
|
if os.path.exists(servPath):
|
|
|
|
|
|
|
|
servicePaths.append(servPath)
|
|
|
|
|
|
|
|
servInstalled.append(serv)
|
|
|
|
return (servicePaths, servInstalled)
|
|
|
|
return (servicePaths, servInstalled)
|
|
|
|
|
|
|
|
|
|
|
|
def backupServer(self):
|
|
|
|
def backupServer(self):
|
|
|
|
@ -4467,13 +4475,13 @@ class servLdap(shareLdap):
|
|
|
|
ldapParser = iniLdapParser()
|
|
|
|
ldapParser = iniLdapParser()
|
|
|
|
#iniPath = ldapParser.pathIniFile
|
|
|
|
#iniPath = ldapParser.pathIniFile
|
|
|
|
#scanPrivDirs.append(iniPath)
|
|
|
|
#scanPrivDirs.append(iniPath)
|
|
|
|
dirDelUsers = self.clVars.Get("soft_ldap_delete_user_dir")
|
|
|
|
dirDelUsers = self.clVars.Get("sr_deleted_path")
|
|
|
|
if os.path.exists(dirDelUsers):
|
|
|
|
if os.path.exists(dirDelUsers):
|
|
|
|
scanPrivDirs.append(dirDelUsers)
|
|
|
|
scanPrivDirs.append(dirDelUsers)
|
|
|
|
# Добавляем calulate.ldap
|
|
|
|
# Добавляем calulate.ldap
|
|
|
|
allArchFiles.append(ldapParser.nameIniFile)
|
|
|
|
allArchFiles.append(ldapParser.nameIniFile)
|
|
|
|
# Добавляем calculate.env
|
|
|
|
# Добавляем calculate.env
|
|
|
|
iniFile = "/" + self.clVars.Get("sys_calculate_ini")
|
|
|
|
iniFile = "/" + self.clVars.Get("cl_env_path")[2]
|
|
|
|
allArchFiles.append(iniFile)
|
|
|
|
allArchFiles.append(iniFile)
|
|
|
|
if "samba" in servInstalled:
|
|
|
|
if "samba" in servInstalled:
|
|
|
|
scanPrivDirs.append(self.sambaPrivate)
|
|
|
|
scanPrivDirs.append(self.sambaPrivate)
|
|
|
|
@ -4687,7 +4695,7 @@ class servLdap(shareLdap):
|
|
|
|
|
|
|
|
|
|
|
|
def removeTmpRestoreFile(self):
|
|
|
|
def removeTmpRestoreFile(self):
|
|
|
|
"""Удаляем временные файлы нужные для восстановлеиня сервисов"""
|
|
|
|
"""Удаляем временные файлы нужные для восстановлеиня сервисов"""
|
|
|
|
profilePath = self.clVars.Get("setup_path_profinstall")[0]
|
|
|
|
profilePath = self.clVars.Get("cl_profile_path")[0]
|
|
|
|
backupDir = os.path.join(profilePath, self.backupDir)
|
|
|
|
backupDir = os.path.join(profilePath, self.backupDir)
|
|
|
|
fileObj = cl_profile._file()
|
|
|
|
fileObj = cl_profile._file()
|
|
|
|
scanObjs = fileObj.scanDirs([backupDir])
|
|
|
|
scanObjs = fileObj.scanDirs([backupDir])
|
|
|
|
@ -4716,8 +4724,8 @@ class servLdap(shareLdap):
|
|
|
|
|
|
|
|
|
|
|
|
используем DN и пароль временного админстратора
|
|
|
|
используем DN и пароль временного админстратора
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
self.ldapObj = ldapFunction(self.clVars.Get("soft_ldap_admin_tmp"),
|
|
|
|
self.ldapObj = ldapFunction(self.clVars.Get("ld_temp_dn"),
|
|
|
|
self.clVars.Get("soft_ldap_adminpw_tmp"))
|
|
|
|
self.clVars.Get("ld_temp_pw"))
|
|
|
|
self.conLdap = self.ldapObj.conLdap
|
|
|
|
self.conLdap = self.ldapObj.conLdap
|
|
|
|
if self.ldapObj.getError():
|
|
|
|
if self.ldapObj.getError():
|
|
|
|
self.printERROR(_("Can not connected to LDAP server") + " ...")
|
|
|
|
self.printERROR(_("Can not connected to LDAP server") + " ...")
|
|
|
|
@ -4733,7 +4741,7 @@ class servLdap(shareLdap):
|
|
|
|
if options.has_key("f"):
|
|
|
|
if options.has_key("f"):
|
|
|
|
forceOptions = True
|
|
|
|
forceOptions = True
|
|
|
|
|
|
|
|
|
|
|
|
if self.clVars.Get("soft_ldap_setup") == "yes" and\
|
|
|
|
if self.clVars.Get("sr_ldap_set") == "on" and\
|
|
|
|
not forceOptions:
|
|
|
|
not forceOptions:
|
|
|
|
self.printWARNING (_("WARNING") + ": " +\
|
|
|
|
self.printWARNING (_("WARNING") + ": " +\
|
|
|
|
_("LDAP server is configured")+ ".")
|
|
|
|
_("LDAP server is configured")+ ".")
|
|
|
|
@ -4767,7 +4775,7 @@ class servLdap(shareLdap):
|
|
|
|
if not self.stopServices(self.getALLServices()):
|
|
|
|
if not self.stopServices(self.getALLServices()):
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
# Получим путь к ini файлу
|
|
|
|
# Получим путь к ini файлу
|
|
|
|
iniFile = "/" + self.clVars.Get("sys_calculate_ini")
|
|
|
|
iniFile = "/" + self.clVars.Get("cl_env_path")[2]
|
|
|
|
# Удаляем ini файл
|
|
|
|
# Удаляем ini файл
|
|
|
|
if os.path.exists(iniFile):
|
|
|
|
if os.path.exists(iniFile):
|
|
|
|
os.remove(iniFile)
|
|
|
|
os.remove(iniFile)
|
|
|
|
@ -4778,10 +4786,10 @@ class servLdap(shareLdap):
|
|
|
|
if os.path.exists(ldapFile):
|
|
|
|
if os.path.exists(ldapFile):
|
|
|
|
os.remove(ldapFile)
|
|
|
|
os.remove(ldapFile)
|
|
|
|
# Имя устанавливаемого сервиса
|
|
|
|
# Имя устанавливаемого сервиса
|
|
|
|
self.clVars.Set("soft_ldap_setup_name","ldap")
|
|
|
|
self.clVars.Set("cl_pass_service","ldap")
|
|
|
|
self.clVars.Write("soft_ldap_setup","no")
|
|
|
|
self.clVars.Write("sr_ldap_set","off")
|
|
|
|
# Первый проход
|
|
|
|
# Первый проход
|
|
|
|
self.clVars.Set("setup_pass_parser","1",True)
|
|
|
|
self.clVars.Set("cl_pass_step","1",True)
|
|
|
|
if not self.applyProfilesFromService('ldap'):
|
|
|
|
if not self.applyProfilesFromService('ldap'):
|
|
|
|
self.printERROR(_("Can not apply profiles") +":"+ _("first pass"))
|
|
|
|
self.printERROR(_("Can not apply profiles") +":"+ _("first pass"))
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
@ -4804,7 +4812,7 @@ class servLdap(shareLdap):
|
|
|
|
self.printOK(_("Added ldif file") +" ...")
|
|
|
|
self.printOK(_("Added ldif file") +" ...")
|
|
|
|
# Второй проход,
|
|
|
|
# Второй проход,
|
|
|
|
# удаляем временного пользователя root из конфигурационного файла
|
|
|
|
# удаляем временного пользователя root из конфигурационного файла
|
|
|
|
self.clVars.Set("setup_pass_parser","2",True)
|
|
|
|
self.clVars.Set("cl_pass_step","2",True)
|
|
|
|
if not self.applyProfilesFromService('ldap'):
|
|
|
|
if not self.applyProfilesFromService('ldap'):
|
|
|
|
self.printERROR(_("Can not apply profiles") +":"+ _("second pass"))
|
|
|
|
self.printERROR(_("Can not apply profiles") +":"+ _("second pass"))
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
@ -4813,12 +4821,12 @@ class servLdap(shareLdap):
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
# Записываем данные администратора сервера
|
|
|
|
# Записываем данные администратора сервера
|
|
|
|
ldapParser.setVar("admin",
|
|
|
|
ldapParser.setVar("admin",
|
|
|
|
{"DN":self.clVars.Get("soft_ldap_admin"),
|
|
|
|
{"DN":self.clVars.Get("ld_admin_dn"),
|
|
|
|
"PASS":self.clVars.Get("soft_ldap_adminpw")})
|
|
|
|
"PASS":self.clVars.Get("ld_admin_pw")})
|
|
|
|
# Устанавливаем автозапуск демона
|
|
|
|
# Устанавливаем автозапуск демона
|
|
|
|
if not self.setDaemonAutostart("slapd"):
|
|
|
|
if not self.setDaemonAutostart("slapd"):
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
self.clVars.Write("soft_ldap_setup","yes")
|
|
|
|
self.clVars.Write("sr_ldap_set","on")
|
|
|
|
self.printOK(_("LDAP service configured") +" ...")
|
|
|
|
self.printOK(_("LDAP service configured") +" ...")
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
|
asamoukin
16 years ago