[debian-edu-commits] r82056 - in branches/wheezy/debian-edu-config: . debian etc/dhcp/dhclient-exit-hooks.d

[pere at alioth.debian.org]

Author: pere
Date: 2013-08-16 15:44:11 +0000 (Fri, 16 Aug 2013)
New Revision: 82056

Added:
   branches/wheezy/debian-edu-config/etc/dhcp/dhclient-exit-hooks.d/fetch-ldap-cert
Modified:
   branches/wheezy/debian-edu-config/Makefile
   branches/wheezy/debian-edu-config/debian/changelog
Log:
Add dhclient-exit-hooks.d script fetch-ldap-cert to fetch the LDAP
server certificate when the network is up, in case it is down on
first boot.

Modified: branches/wheezy/debian-edu-config/Makefile
===================================================================
--- branches/wheezy/debian-edu-config/Makefile	2013-08-16 15:36:40 UTC (rev 82055)
+++ branches/wheezy/debian-edu-config/Makefile	2013-08-16 15:44:11 UTC (rev 82056)
@@ -101,6 +101,7 @@
 	cfengine/inputs/cfagent.conf \
 	cups/cupsd-debian-edu.conf \
 	dhcp/dhclient-exit-hooks.d/wpad-proxy-update \
+	dhcp/dhclient-exit-hooks.d/fetch-ldap-cert \
 	dhcp/dhclient-exit-hooks.d/hostname \
 	dhcp/dhcpd-debian-edu.conf \
 	dhcp/dhclient-debian-edu.conf \

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-08-16 15:36:40 UTC (rev 82055)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-08-16 15:44:11 UTC (rev 82056)
@@ -1,5 +1,6 @@
 debian-edu-config (1.712~svn82050) UNRELEASED; urgency=low
 
+  [ Mike Gabriel ]
   * Fix Samba LDAP bootstrap during main-server installation. The Samba2LDAP
     connection now uses ldapi:/// during bootstrap. As a result the
     sambaDomainName=SKOLELINUX object will now be created during bootstrap
@@ -7,6 +8,11 @@
     samba-domain-policy.ldif will be kept for reference and possible later
     customizations (by site admins).
 
+  [ Petter Reinholdtsen ]
+  * Add dhclient-exit-hooks.d script fetch-ldap-cert to fetch the LDAP
+    server certificate when the network is up, in case it is down on
+    first boot.
+
  -- Mike Gabriel <sunweaver at debian.org>  Fri, 16 Aug 2013 17:32:06 +0200
 
 debian-edu-config (1.712~svn82049) wheezy-test; urgency=low

Added: branches/wheezy/debian-edu-config/etc/dhcp/dhclient-exit-hooks.d/fetch-ldap-cert
===================================================================
--- branches/wheezy/debian-edu-config/etc/dhcp/dhclient-exit-hooks.d/fetch-ldap-cert	                        (rev 0)
+++ branches/wheezy/debian-edu-config/etc/dhcp/dhclient-exit-hooks.d/fetch-ldap-cert	2013-08-16 15:44:11 UTC (rev 82056)
@@ -0,0 +1,19 @@
+#!/bin/sh
+# Make sure LDAP certificate is downloaded when the network become
+# available, if the init.d script failed to fetch it at boot.
+
+if [ -r /etc/debian-edu/config ] ; then
+    . /etc/debian-edu/config
+fi
+
+if [ false = "$DHCP_FETCH_LDAP_CERT" ] ; then
+    exit 0
+fi
+
+case $reason in
+    BOUND|RENEW|REBIND|REBOOT)
+	/etc/init.d/fetch-ldap-cert start
+	;;
+    EXPIRE|FAIL|RELEASE|STOP)
+	;;
+esac