git-svn-id: http://svn.calculate.ru/calculate2/calculate-server/trunk@100 c91db197-33c1-4113-bf15-f8a5c547ca64

profile/ldap/etc/nsswitch.conf

@@ -0,0 +1,18 @@
+# Calculate format=ldap setup_pass_parser==1 insert=replace
+passwd:      files ldap
+shadow:      files ldap
+group:       files ldap
+
+hosts:       files dns
+networks:    files dns
+
+services:    files ldap
+protocols:   files ldap
+rpc:         db files
+ethers:      db files
+netmasks:    files
+netgroup:    files ldap
+bootparams:  files
+
+automount:   files ldap
+aliases:     files

profile/samba/etc/ldap.conf

@@ -0,0 +1,2 @@
+# Calculate format=ldap
++nss_base_passwd ou=Computers,#-soft_ldap_base-#?one

profile/samba/etc/samba/smb.conf

@@ -87,7 +87,7 @@
 	time server = yes
 	;time offset =
 
-[Homes]
+[homes]
 	path = /var/calculate/share/%u
 	comment = Home Directories
 	valid users = %U
@@ -96,7 +96,7 @@
 	directory mask = 0775
 	browseable = No
 
-[Profiles]
+[profiles]
 	path = /var/calculate/winnt/profiles
 	create mask = 0600
 	directory mask = 0700
@@ -116,5 +116,4 @@
 	browseable = yes
 	writable = yes
 	path = /var/calculate/share
-	hide unreadable = yes
- 
+	hide unreadable = yes

pym/cl_ldap.py

@@ -637,7 +637,7 @@ _("in the system") + ".\n"
         """Начальная настройка LDAP сервиса"""
         # Принудительная установка
         forceOptions = False
-        if "f" in options:
+        if options.has_key("f"):
             forceOptions = True
         clVars = cl_base.DataVars()
         clVars.flServer()
@@ -713,17 +713,18 @@ LDAP in backup directory")
         """Начальная настройка Samba сервиса"""
         # Принудительная установка
         forceOptions = False
-        if "f" in options:
+        if options.has_key("f"):
             forceOptions = True
         clVars = cl_base.DataVars()
         clVars.flServer()
         clVars.flIniFile()
-        if not clVars.Get("soft_ldap_setup") == "yes":
-            self.printERROR(_("ERROR") + ": " +\
-            _("LDAP service is not configured")+ ".")
-            print _("Configure service LDAP:")
-            print "  cl-setup ldap"
-            return False
+        # В случае если сервер установлен
+        if clVars.Get("soft_samba_setup") == "yes" and\
+            not forceOptions:
+            self.printWARNING (_("WARNING") + ": " +\
+            _("Samba server is configured")+ ".")
+            return True
+
         # Проверим запущен ли сервис Samba
         if self.getRunService("samba"):
             self.printWARNING (_("WARNING") + ": " +\
@@ -735,8 +736,15 @@ Samba in backup directory")
             print "3. " + _("Restart the program")
             return True
         clVars.Write("soft_samba_setup","no")
-         # Cоздаем объект профиль устанавливая директорию samba для
+        # Cоздаем объект профиль устанавливая директорию samba для
         # файлов профилей
         clProf = cl_profile.profile(clVars,"samba")
         # Объединяем профили
         clProf.applyProfiles()
+        #textLine = self.execProg("/etc/init.d/samba start")
+        #if "ok" in textLine:
+            #self.printOK(_("Samba start ..."))
+        #else:
+            #self.printNotOK(_("Samba start ..."))
+            #return False
+        self.printOK(_("Samba service configured ..."))

scripts/cl-setup

@@ -30,24 +30,27 @@ class tsOpt(cl_base.opt):
         self.obj =obj
         self.shortOpt = self.obj.getAllOpt('short')
         self.longOpt = self.obj.getAllOpt('long')
-        self.opt = []
+        self.opt = {}
         self.sysArgv = sys.argv[1:]
         self.__iter = 0
         self.params = {}
         cl_base.opt.__init__(self, self.shortOpt, self.longOpt)
-        if "h" in self.opt or (not self.params.has_key('service')and\
+        if "h" in self.opt or (not self.params.has_key('service') and\
             not self.opt):
             print self.obj.getHelp()
         else:
-            if not (self.params['service'] in self.obj.allServ):
+            if self.params.has_key('service'):
+                if not (self.params['service'] in self.obj.allServ):
+                    self.handlerErrOpt()
+            else:
                 self.handlerErrOpt()
 
     def handlerOpt(self,option,value):
         # Обработчик (опция значение)
         #print option, value
         shortOpt = self.obj.getShortOpt(option)
-        if not shortOpt in self.opt:
-            self.opt.append(shortOpt)
+        if not self.opt.has_key(shortOpt):
+            self.opt[shortOpt] = value
 
 
     def handlerErrOpt(self):
@@ -70,7 +73,9 @@ if __name__ == "__main__":
     ldapObj = cl_ldap.cl_ldap("cl-setup")
     optObj = tsOpt(ldapObj)
     if optObj.params.has_key('service'):
+        # Настройка сервера LDAP
         if optObj.params['service'] == "ldap":
             ldapObj.setupLdapServer(optObj.opt)
+        # Настройка сервера Samba
         elif optObj.params['service'] == "samba":
             ldapObj.setupSambaServer(optObj.opt)