|
|
|
@ -6008,12 +6008,6 @@ the password will be changed only for Samba account")
|
|
|
|
|
'helpChapter':_("Jabber service options"),
|
|
|
|
|
'help':_("jabber host, default - hostname")
|
|
|
|
|
},
|
|
|
|
|
{'progAccess':(6,),
|
|
|
|
|
'optVal':"HOST",
|
|
|
|
|
'longOption':"host",
|
|
|
|
|
'helpChapter':_("FTP service options"),
|
|
|
|
|
'help':_("ftp host, default - hostname")
|
|
|
|
|
},
|
|
|
|
|
# Опции cl-passwd
|
|
|
|
|
# LDAP пользователь
|
|
|
|
|
{'progAccess':(7,),
|
|
|
|
@ -6484,13 +6478,6 @@ class servFtp(shareLdap):
|
|
|
|
|
# Имя устанавливаемого сервиса
|
|
|
|
|
self.clVars.Set("cl_pass_service","ftp")
|
|
|
|
|
self.clVars.Write("sr_ftp_set","off")
|
|
|
|
|
# Почтовый ност
|
|
|
|
|
if options.has_key("host"):
|
|
|
|
|
fullHostName = options['host']
|
|
|
|
|
else:
|
|
|
|
|
fullHostName = "%s.%s"%(self.clVars.Get('os_net_hostname'),
|
|
|
|
|
self.clVars.Get('os_net_domain'))
|
|
|
|
|
self.clVars.Set("sr_ftp_host",fullHostName,True)
|
|
|
|
|
if not self.applyProfilesFromService('ftp'):
|
|
|
|
|
return False
|
|
|
|
|
# Проверим запущен ли ldap
|
|
|
|
@ -6557,13 +6544,6 @@ class servFtp(shareLdap):
|
|
|
|
|
# Устанавливаем автозапуск демона
|
|
|
|
|
if not self.setDaemonAutostart("proftpd"):
|
|
|
|
|
return False
|
|
|
|
|
#запишем переменные для сервера
|
|
|
|
|
ftpHost = self.clVars.Get("sr_ftp_host")
|
|
|
|
|
self.clVars.Write("sr_ftp_host",ftpHost,True,"local")
|
|
|
|
|
#запишем переменные для клиента
|
|
|
|
|
clientVars = ["sr_ftp_host"]
|
|
|
|
|
if not self.saveVarsClient(clientVars):
|
|
|
|
|
return False
|
|
|
|
|
#cоздаем рабочую ftp директорию
|
|
|
|
|
ftpPath = self.clVars.Get("sr_ftp_path")
|
|
|
|
|
if not os.path.exists(ftpPath):
|
|
|
|
|