Merge branch 'hotfix-0.2.1' into stable

tls.ldif
[twgit] Init hotfix 'hotfix-0.2.1'.
2014-05-05 13:58:14 +02:00 · 2014-05-05 13:56:51 +02:00 · 2014-05-05 13:53:36 +02:00
1 changed files with 1 additions and 1 deletions
@@ -52,7 +52,7 @@ if [ -e /etc/ldap/ssl/ldap.crt ] && [ -e /etc/ldap/ssl/ldap.key ] && [ -e /etc/l
  # create DHParamFile if not found
  [ -f /etc/ldap/ssl/dhparam.pem ] || openssl dhparam -out /etc/ldap/ssl/dhparam.pem 2048
-  ldapmodify -Y EXTERNAL -H ldapi:/// -f /etc/ldap/config/auto/tls_add.ldif 
+  ldapmodify -Y EXTERNAL -H ldapi:/// -f /etc/ldap/config/auto/tls.ldif 
  # add fake dnsmasq route to certificate cn
  cn=$(openssl x509 -in /etc/ldap/ssl/ldap.crt -subject -noout | sed -n 's/.*CN=\(.*\).\^*/\1/p')
Author	SHA1	Message	Date
Bertrand Gouny	9e3d056cc1	Merge branch 'hotfix-0.2.1' into stable	2014-05-05 13:58:14 +02:00
Bertrand Gouny	a7f76b5604	tls.ldif	2014-05-05 13:56:51 +02:00
Bertrand Gouny	c00fd8cfc7	[twgit] Init hotfix 'hotfix-0.2.1'.	2014-05-05 13:53:36 +02:00