Merge branch '2.6.0/fix-LDAP-TLS'

tmpl/sunstone-ldap_auth.conf

@@ -7,14 +7,16 @@ server 1:
     #:password: 'password'
 
     # Ldap authentication method
+    :auth_method: :simple
 
     # Ldap server
     :host: %%adresse_ip_ldap
 %if %%getVar('ldap_tls', 'non') == 'oui'
-    :auth_method: :simple_tls
     :port: 636
+
+    # Uncomment this line for tls conections
+    :encryption: :simple_tls
 %else
-    :auth_method: :simple
     :port: 389
 %end if