Changeset 1246

Timestamp:

01/19/12 21:54:49 (4 months ago)

Author:

tschmitt

Message:

• linuxmuster-setup: weitere Abstimmungen mit sophomorix.

Location:

main/linuxmuster-base/branches/testing

Files:

• debian/changelog (modified) (1 diff)
• var/config-dynamic/15_ldap/postpatch (modified) (2 diffs)
• var/config-dynamic/15_ldap/slapd.conf (modified) (1 diff)
• var/config-dynamic/17_admins/prepatch (modified) (1 diff)
• var/config-static/etc/ldap (deleted)

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

@@ -5 +5 @@
     - removed rembo reload.
     - updated dhcp server reload invokation.
-  * linuxmuster-setup: added SLAPD_CONF="/etc/ldap/slapd.conf" in /etc/default/slapd.
-
- -- Thomas Schmitt <schmitt@lmz-bw.de>  Thu, 19 Jan 2012 19:08:04 +0100
+  * linuxmuster-setup:
+    - added SLAPD_CONF="/etc/ldap/slapd.conf" in /etc/default/slapd.
+    - ldap: more improvements according to sophomorix.
+
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Thu, 19 Jan 2012 21:51:04 +0100
 
 linuxmuster-base (6.0.0-5ubuntu0) 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
+        # clean 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
+        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
@@ -171 +171 @@
 sophomorix-setup-pgldap
 sophomorix-dump-pg2ldap
+sophomorix-setup-pgldap
 
 
-# finally create homes on first install
-if [ "$1" = "--first" -a -n "$SOPHOMORIX" ]; then
- sophomorix-repair --permissions
- sophomorix-repair --repairhome
-fi
+# finally create homes
+for i in $ADMINISTRATOR $PGMADMIN $WWWADMIN; do
+ mkdir -p $ADMINSHOME/$i
+ chown $i:$ADMINGROUP $ADMINSHOME/$i
+done
+chmod 700 $ADMINSHOME -R
 

main/linuxmuster-base/branches/testing/var/config-dynamic/15_ldap/slapd.conf

@@ -17 +17 @@
 include         /etc/ldap/schema/inetorgperson.schema
 include         /etc/ldap/schema/samba.schema
-#include         /etc/ldap/schema/sophomorix.schema
+include         /etc/ldap/schema/sophomorix.schema
 
 # Schema check allows for forcing entries to

main/linuxmuster-base/branches/testing/var/config-dynamic/17_admins/prepatch

@@ -26 +26 @@
    sophomorix-usermod -I wwwadmin
   else
-   for i in $ADMINISTRATOR $PGMADMIN $WWWADMIN; do
-    mkdir -p $ADMINSHOME/$i
-    chown $i:$ADMINGROUP $ADMINSHOME/$i
-   done
    echo -e "$adminpw\n$adminpw\n" | smbldap-passwd -s $DOMADMIN
    echo -e "$adminpw\n$adminpw\n" | smbldap-passwd -s $ADMINISTRATOR