Changeset 1294

Timestamp:

Aug 10, 2009, 8:54:28 PM (15 years ago)

Author:

mitchb

Message:

We got nss-ldapd into Fedora!  Stop building it from OpenSuSE.

Location:

trunk/server

Files:

• common/oursrc/nss-ldapd (deleted)
• doc/install-howto.sh (modified) (1 diff)
• fedora/Makefile (modified) (3 diffs)
• fedora/config/etc/nss-ldapd.conf (modified) (5 diffs)
• fedora/specs/nss-ldapd.spec.patch (deleted)

trunk/server/doc/install-howto.sh

@@ -86 +86 @@
     service named start
     chkconfig named on
-
-# XXX: This sometimes doesn't exist, but it really sucks if it
-# does exist. So check for it.
-# yum remove nss_ldap, because nss-ldapd conflicts with it
 
 # In the case of the Kerberos libraries, you'll be told that

trunk/server/fedora/Makefile

@@ -21 +21 @@
 upstream_yum    = krb5 httpd openssh php
 upstream        = openafs $(upstream_yum)
-oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i586 whoisd mit-zephyr nss-ldapd nss-ldapd.i586 athrun php_scripts scripts-base
+oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i586 whoisd mit-zephyr athrun php_scripts scripts-base
 allsrc          = $(upstream) $(oursrc)
 oursrcdir       = ${PWD}/../common/oursrc
@@ -39 +39 @@
 server_arch     = "fedora.stable"
 openafs_url     = "http://dl.openafs.org/dl/openafs/1.4.11/openafs-1.4.11-1.1.1.src.rpm"
-nss_ldapd_url   = "http://download.opensuse.org/repositories/network:/ldap/openSUSE_Factory/src/nss-ldapd-0.6.10-6.5.src.rpm"
 
 .PHONY: minimal-clean
@@ -64 +63 @@
         #wget -qO- -nv $(server_url)/$(server_arch) | xargs make
         cd $(dload) && yumdownloader --source $(upstream_yum)
-        wget -P $(dload) $(nss_ldapd_url)
         wget -P $(dload) $(openafs_url)
         touch download_stamp

trunk/server/fedora/config/etc/nss-ldapd.conf

@@ -6 +6 @@
 
 # The uri pointing to the LDAP server to use for name lookups.
-# Mulitple entries may be specified. The address that is used
+# Multiple entries may be specified. The address that is used
 # here should be resolvable without using LDAP (obviously).
 #uri ldap://127.0.0.1/
@@ -12 +12 @@
 #uri ldapi://%2fvar%2frun%2fldapi_sock/
 # Note: %2f encodes the '/' used as directory separator
-uri ldapi://%2fvar%2frun%2fdirsrv%2fslapd-scripts.socket/
+# uri ldap://127.0.0.1/
 
 # The LDAP version to use (defaults to 3
@@ -19 +19 @@
 
 # The distinguished name of the search base.
-base dc=scripts,dc=mit,dc=edu
+# base dc=example,dc=com
 
 # The distinguished name to bind to the server with.
 # Optional: default is to bind anonymously.
-#binddn cn=proxyuser,dc=padl,dc=com
+#binddn cn=proxyuser,dc=example,dc=com
 
 # The credentials to bind with.
 # Optional: default is no credentials.
+# Note that if you set a bindpw you should check the permissions of this file.
 #bindpw secret
 
@@ -35 +36 @@
 
 # Customize certain database lookups.
-base   group  ou=Groups,dc=scripts,dc=mit,dc=edu
-base   passwd ou=People,dc=scripts,dc=mit,dc=edu
-#base   shadow ou=People,dc=example,dc=net
+#base   group  ou=Groups,dc=example,dc=com
+#base   passwd ou=People,dc=example,dc=com
+#base   shadow ou=People,dc=example,dc=com
 #scope  group  onelevel
 #scope  hosts  sub
 
 # Bind/connect timelimit.
-bind_timelimit 120
+#bind_timelimit 30
 
 # Search timelimit.
-timelimit 120
+#timelimit 30
 
 # Idle timelimit. nslcd will close connections if the
 # server has not been contacted for the number of seconds.
-idle_timelimit 3600
+#idle_timelimit 3600
 
-# Netscape SDK LDAPS
-#ssl on
-
-# Netscape SDK SSL options
-#sslpath /etc/ssl/certs
-
-# OpenLDAP SSL mechanism
-# start_tls mechanism uses the normal LDAP port, LDAPS typically 636
+# Use StartTLS without verifying the server certificate.
 #ssl start_tls
-#ssl on
-
-# OpenLDAP SSL options
-# Require and verify server certificate (yes/no)
-# Default is to use libldap's default behavior, which can be configured in
-# /etc/openldap/ldap.conf using the TLS_REQCERT setting.  The default for
-# OpenLDAP 2.0 and earlier is "no", for 2.1 and later is "yes".
-#tls_checkpeer yes
+#tls_reqcert never
 
 # CA certificates for server certificate verification
-# At least one of these are required if tls_checkpeer is "yes"
 #tls_cacertdir /etc/ssl/certs
 #tls_cacertfile /etc/ssl/ca.cert
@@ -137 +123 @@
 #map    group  uniqueMember     member
 #map    group  gidNumber        gid
+uid nslcd
+gid ldap
+# This comment prevents repeated auto-migration of settings from /etc/ldap.conf.
+uri ldapi://%2fvar%2frun%2fdirsrv%2fslapd-scripts.socket/
+base dc=scripts,dc=mit,dc=edu
+timelimit 120
+bind_timelimit 120
+idle_timelimit 3600
+base   group  ou=Groups,dc=scripts,dc=mit,dc=edu
+base   passwd ou=People,dc=scripts,dc=mit,dc=edu