Changeset 1267

Timestamp:

01/30/12 17:04:15 (4 months ago)

Author:

tschmitt

Message:

• Fix: Änderung der Schulkonsolenkonfiguration (paedML 4 auf 5) wird nicht nachgeführt (#573).
• Fix: Konfiguration der smbldap-tools wird nicht migriert (#575).

Location:

main/linuxmuster-migration/trunk

Files:

• debian/changelog (modified) (1 diff)
• share/include.conf (modified) (1 diff)
• share/linuxmuster-migration-restore.sh (modified) (2 diffs)

main/linuxmuster-migration/trunk/debian/changelog

@@ +1 @@
+linuxmuster-migration (1.0.12-0) unstable; urgency=low
+
+  * fixed smbldap-tools migration (closes #575).
+  * fixed linuxmuster-schulkonsole's permissions.conf upgrade during migration
+    from paedML 4 to 5 (closes #573).
+
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Mon, 30 Jan 2011 16:54:21 +0100
+
 linuxmuster-migration (1.0.11-0) unstable; urgency=low
 

main/linuxmuster-migration/trunk/share/include.conf

@@ -33 +33 @@
 /etc/samba/smb.conf.global
 /etc/samba/smb.conf.shares
+/etc/smbldap-tools
 /etc/sophomorix/user
 /etc/ssh

main/linuxmuster-migration/trunk/share/linuxmuster-migration-restore.sh

@@ -295 +295 @@
 net setdomainsid "$sambasid"
 smbpasswd -w `cat /etc/ldap.secret`
-sed -e "s|^SID=.*|SID=\"$sambasid\"|" -i /etc/smbldap-tools/smbldap.conf
 
 
@@ -575 +574 @@
  chmod 700 /var/lib/ldap
  chmod 600 /var/lib/ldap/*
+ # smbldap-tools
+ echo " * smbldap-tools ..."
+ CONF=/etc/smbldap-tools/smbldap.conf
+ cp $CONF $CONF.migration
+ sed -e "s/@@sambasid@@/${sambasid}/
+         s/@@workgroup@@/${workgroup}/
+         s/@@basedn@@/${basedn}/" $LDAPDYNTPLDIR/`basename $CONF` > $CONF
+ CONF=/etc/smbldap-tools/smbldap_bind.conf
+ cp $CONF $CONF.migration
+ sed -e "s/@@message1@@/${message1}/
+         s/@@message2@@/${message2}/
+         s/@@message3@@/${message3}/
+         s/@@basedn@@/${basedn}/g
+         s/@@ldappassword@@/${ldapadminpw}/g" $LDAPDYNTPLDIR/`basename $CONF` > $CONF
+ chmod 600 ${CONF}*
  # freeradius
  CONF=/etc/freeradius/clients.conf