Changeset 1234

Timestamp:

01/18/12 17:17:08 (4 months ago)

Author:

tschmitt

Message:

• linuxmuster-setup:
  • network: Interface-Name korrigiert.
  • ldap: Benutzt eigenes ldif anstatt sophomorix-dump-pg2ldap.
• helperfunctions.sh, assigh_nic(): Prüft zuerst, ob network.settings vorhanden ist, bevor iface_lan hineingeschrieben wird.

Location:

main/linuxmuster-base/branches/testing

Files:

• debian/changelog (modified) (2 diffs)
• share/scripts/helperfunctions.sh (modified) (1 diff)
• share/scripts/linuxmuster-patch (modified) (1 diff)
• var/config-dynamic/01_network/interfaces (modified) (1 diff)
• var/config-dynamic/15_ldap/ldap.ldif (modified) (1 diff)
• var/config-dynamic/15_ldap/postpatch (modified) (2 diffs)

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

@@ +1 @@
+linuxmuster-base (6.0.0-5ubuntu0) lenny; urgency=low
+
+  * helperfunctions.sh, assign_nics(): checks existance of network.settings before iface_lan is written.
+  * 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:10:16 +0100
+
 linuxmuster-base (6.0.0-4ubuntu0) lenny; urgency=low
 
@@ -8 +17 @@
   * added linuxmuster-nagios-base to server task again.
 
- -- Thomas Schmitt <schmitt@lmz-bw.de>  Tue, 17 Jan 2012 23:19:23 +0100
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Tue, 17 Jan 2012 23:21:41 +0100
 
 linuxmuster-base (6.0.0-3ubuntu0) lenny; urgency=low

main/linuxmuster-base/branches/testing/share/scripts/helperfunctions.sh

@@ -473 +473 @@
 
  # write iface to network.settings
- if grep -q ^iface_lan $NETWORKSETTINGS; then
-  sed -e "s|^iface_lan=.*|iface_lan=$iface_lan|" -i $NETWORKSETTINGS
- else
-  echo "iface_lan=$iface_lan" >> $NETWORKSETTINGS
+ if [ -e "$NETWORKSETTINGS" ]; then
+  if grep -q ^iface_lan $NETWORKSETTINGS; then
+   sed -e "s|^iface_lan=.*|iface_lan=$iface_lan|" -i $NETWORKSETTINGS
+  else
+   echo "iface_lan=$iface_lan" >> $NETWORKSETTINGS
+  fi
  fi
 

main/linuxmuster-base/branches/testing/share/scripts/linuxmuster-patch

@@ -216 +216 @@
               s/@@ipcoporange@@/${ipcoporange}/g
               s/@@ipcopovpn@@/${ipcopovpn}/g
+              s/@@iface_lan@@/${iface_lan}/g
               s/@@broadcast@@/${broadcast}/g
               s/@@internsub@@/${internsub}/g

main/linuxmuster-base/branches/testing/var/config-dynamic/01_network/interfaces

@@ -9 +9 @@
 # These interfaces are brought up automatically
 auto intern
-iface intern inet static
+iface @@iface_lan@@ inet static
         address @@serverip@@
         netmask @@internmask@@

main/linuxmuster-base/branches/testing/var/config-dynamic/15_ldap/ldap.ldif

@@ -3 +3 @@
 objectClass: organization
 o: linuxmuster
-dc: paedml-linux
+dc: linuxmuster
 structuralObjectClass: organization
 entryUUID: b74928aa-d314-1030-98de-bd3e6f095251

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

@@ -74 +74 @@
 
         # 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
-        #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
+        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:.*|${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
@@ -158 +159 @@
 
 # recreate ldap tree
-sophomorix-dump-pg2ldap
+#sophomorix-dump-pg2ldap
 
 rm -f /var/tmp/ldap.*