Changeset 1240

Timestamp:

01/19/12 09:21:05 (4 months ago)

Author:

tschmitt

Message:

• linuxmuster-setup, ldap: benutzt wieder sophomorix-dump-pg2ldap.

Location:

main/linuxmuster-base/branches/testing

Files:

• debian/changelog (modified) (1 diff)
• var/config-dynamic/15_ldap/postpatch (modified) (2 diffs)

main/linuxmuster-base/branches/testing/debian/changelog

@@ -4 +4 @@
   * linuxmuster-setup: 
     * network: fixed interface name.
-    * ldap: using ldif instead of sophomorix-dump-pg2ldap.
-
- -- Thomas Schmitt <schmitt@lmz-bw.de>  Wed, 18 Jan 2012 17:17:23 +0100
+
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Thu, 19 Jan 2012 09:18:40 +0100
 
 linuxmuster-base (6.0.0-4ubuntu0) lenny; urgency=low

main/linuxmuster-base/branches/testing/var/config-dynamic/15_ldap/postpatch

@@ -73 +73 @@
         psql -U postgres ldap < /var/tmp/ldap.pgsql
 
-        # create new ldap tree
-        rm -rf /etc/ldap/slapd.d
-        mkdir -p /etc/ldap/slapd.d
-        chattr +i /var/lib/ldap/DB_CONFIG
-        rm -f /var/lib/ldap/*
-        chattr -i /var/lib/ldap/DB_CONFIG
-        sed -e "s|^dc:.*|dc: ${domainname%.*}|" -i /var/tmp/ldap.ldif
-        slapadd < /var/tmp/ldap.ldif
-        chown openldap:openldap /var/lib/ldap -R
-        slaptest -f /etc/ldap/slapd.conf -F /etc/ldap/slapd.d
-        chown -R openldap:openldap /etc/ldap/slapd.d
+#        # create new ldap tree
+#        rm -rf /etc/ldap/slapd.d
+#        mkdir -p /etc/ldap/slapd.d
+#        chattr +i /var/lib/ldap/DB_CONFIG
+#        rm -f /var/lib/ldap/*
+#        chattr -i /var/lib/ldap/DB_CONFIG
+#        sed -e "s|^dc:.*|dc: ${domainname%.*}|" -i /var/tmp/ldap.ldif
+#        slapadd < /var/tmp/ldap.ldif
+#        chown openldap:openldap /var/lib/ldap -R
+#        slaptest -f /etc/ldap/slapd.conf -F /etc/ldap/slapd.d
+#        chown -R openldap:openldap /etc/ldap/slapd.d
 
         # changing user's default shell to /bin/bash
@@ -159 +159 @@
 
 # recreate ldap tree
-#sophomorix-dump-pg2ldap
+sophomorix-dump-pg2ldap
 
 rm -f /var/tmp/ldap.*