[debian-edu-commits] r82147 - in branches/wheezy/debian-edu-config: debian ldap-tools

[pere at alioth.debian.org]

Author: pere
Date: 2013-08-20 05:14:01 +0000 (Tue, 20 Aug 2013)
New Revision: 82147

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/ldap-tools/ldap-debian-edu-install
Log:
Wrap long comment lines in ldap-debian-edu-install.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-08-20 04:47:35 UTC (rev 82146)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-08-20 05:14:01 UTC (rev 82147)
@@ -1,3 +1,10 @@
+debian-edu-config (1.713~svn82146) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Wrap long comment lines in ldap-debian-edu-install.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Mon, 19 Aug 2013 23:45:27 +0200
+
 debian-edu-config (1.712) unstable; urgency=low
 
   [ Petter Reinholdtsen ]

Modified: branches/wheezy/debian-edu-config/ldap-tools/ldap-debian-edu-install
===================================================================
--- branches/wheezy/debian-edu-config/ldap-tools/ldap-debian-edu-install	2013-08-20 04:47:35 UTC (rev 82146)
+++ branches/wheezy/debian-edu-config/ldap-tools/ldap-debian-edu-install	2013-08-20 05:14:01 UTC (rev 82147)
@@ -18,8 +18,8 @@
 # db_set debian-edu-config/first-user-password <firstuserpw>
 # </quote>
 #
-# o then run the just created script; you have to run it using its full path
-#   (otherwise debconf will throw an error)
+# o then run the just created script; you have to run it using its
+#   full path (otherwise debconf will throw an error)
 # o edit /etc/gosa/gosa.conf and replace password hashes after options
 #   named ,,adminPassword'' and ,,snapshotAdminPassword'' with the 
 #   placeholder string ,,$GOSAPWD''
@@ -446,11 +446,12 @@
    dns proxy = yes
 EOF
 
-    # Store root's password temporarily in secrets.tdb (for cn=admin,ou=ldap-access,BASEDN)
+    # Store root's password temporarily in secrets.tdb (for
+    # cn=admin,ou=ldap-access,BASEDN)
     smbpasswd -c /etc/samba/smb-debian-edu-ldapbootstrap.conf -w "$ROOTPWDCLEAR"
 
-    # This will initialize the sambaDomainName=<DOMAIN> object in LDAP and
-    # generate a sambaSID for <DOMAIN>.
+    # This will initialize the sambaDomainName=<DOMAIN> object in LDAP
+    # and generate a sambaSID for <DOMAIN>.
     net -s /etc/samba/smb-debian-edu-ldapbootstrap.conf getlocalsid &> /dev/null
 
     # start from scratch with secrets.tdb...
@@ -459,8 +460,8 @@
     # remove the bootstrap smb.conf again... this file was really temporary...
     rm -f /etc/samba/smb-debian-edu-ldapbootstrap.conf
 
-    # now set up our auto-generated Samba password (created further above) that shall be 
-    # used in smb.conf and with smbldap-tools
+    # now set up our auto-generated Samba password (created further
+    # above) that shall be used in smb.conf and with smbldap-tools
     # (i.e. for cn=smbadmin,ou=samba,dc=skole,dc=skolelinux,dc=no)...
     smbpasswd -c /etc/samba/smb.conf -w "$SAMBAPWD"
 
@@ -474,11 +475,13 @@
       echo "error: unable to fetch Samba SID"
       exit 1
     fi
-    # the next line is unknowingly dirty, but it fixes a ,,Can't fetch domain SID 
-    # for name: TJENER'' error if running ,,net getlocalsid'' after the bootstrap.
+    # the next line is unknowingly dirty, but it fixes a ,,Can't fetch
+    # domain SID for name: TJENER'' error if running ,,net
+    # getlocalsid'' after the bootstrap.
     net getlocalsid -s /dev/null &> /dev/null
 
-    # and now... stop slapd again... and restore start-stop-daemon script
+    # and now... stop slapd again... and restore start-stop-daemon
+    # script
     remember_RESTARTSLAPD=$RESTARTSLAPD
     slapd_stop
     RESTARTSLAPD=$remember_RESTART_SLAPD
@@ -536,7 +539,8 @@
     killall slapd
   fi
 
-  # again: in Etch, Lenny, Squeeze..., the database must be owned by openldap
+  # again: in Etch, Lenny, Squeeze..., the database must be owned by
+  # openldap
   if getent passwd openldap | grep  -q openldap ; then
      chown -R openldap:openldap /var/lib/ldap
   fi