Changeset 3277

Timestamp:

01/08/08 21:24:03 (16 years ago)

Author:

matt

Message:

Update LDAP installation instructions to note different paths for different distributions

Location:

pykota/trunk

Files:

• docs/installation.sgml (modified) (2 diffs)
• initscripts/ldap/README.ldap (modified) (3 diffs)
• pykota/config.py (modified) (2 diffs)

pykota/trunk/docs/installation.sgml

@@ -340 +340 @@
     $ cp pykota.schema /etc/ldap/schema
           </screen>
+          <note>
+            <title>Note</title>
+            <para>
+              If you are using a Red Hat-based system, substitute 
+              <filename>/etc/openldap</filename> for 
+              <filename>/etc/ldap</filename>.
+            </para>
+          </note>
           <note>
             <title>Note</title>
@@ -405 +413 @@
           </screen>
         </para>
-        
+        <note>
+          <title>Note</title>
+          <para>
+          On Red Hat-based distros, use '/sbin/service ldap stop' and 
+        '/sbin/service ldap start' instead.
+          </para>
+        </note>
         <para>
           With an <acronym>LDAP</acronym> backend, PyKota will need some branches

pykota/trunk/initscripts/ldap/README.ldap

@@ -33 +33 @@
         $ cp pykota.schema /etc/ldap/schema
         (no need to do this if you install from PyKota's Debian package)
+
+    NB: With OpenLDAP under Red Hat-based distros, where /etc/ldap is 
+        referenced, substitute /etc/openldap. e.g. 
+
+        $ cp pykota.schema /etc/openldap/schema
         
     Then edit /etc/ldap/slapd.conf and add a line to    
@@ -96 +101 @@
     
         $ /etc/init.d/slapd stop
-        
+    
     Generate the index files :    
     
@@ -105 +110 @@
         $ /etc/init.d/slapd start
 
+    NB: On Red Hat-based distros, use '/sbin/service ldap stop' and 
+        '/sbin/service ldap start' instead.
+    
 pykota-sample.ldif :
 

pykota/trunk/pykota/config.py

@@ -521 +521 @@
         return self.isTrue(self.getGlobalOption("disablehistory", ignore=1))
             
+<<<<<<< .mine
+=======
     def getUserNameToLower(self) :          
         """Deprecated."""
         return self.getGlobalOption("utolower", ignore=1)
         
+>>>>>>> .r2547
     def getUserNameCase(self) :
         """Returns value for user name case: upper, lower or native"""
@@ -653 +656 @@
         """Returns the winbind separator's value if it is set, else None."""
         return self.getGlobalOption("winbind_separator", ignore=1)
+
+    def getUserNameCase(self) :
+        """Returns value for user name case: upper, lower or native"""
+        validvalues = [ "upper", "lower", "native" ]
+        value = self.getGlobalOption("usercasename", ignore=1).strip().lower()
+        if value not in validvalues :
+            raise PyKotaConfigError, _("Option usercasename only supports values in %s") % str(validvalues)
+        return value
 
     def getAccountBanner(self, printername) :