Commit fdd66cc4 authored by Jonathan's avatar Jonathan
Browse files

Merge pull request #22 from djjudas21/multiple_ldap_servers 

Multiple LDAP servers
parents eb77d6cc 0d002666

README.md

+2 −2
Original line number Diff line number Diff line
@@ -374,8 +374,8 @@ Password for the `identity` account. Required. 
Unless overridden in another section, the dn from which all searches will start from. Required.



##### `server`

Hostname of IP address of the LDAP server. Note that this needs to match the name(s) in the LDAP server

certificate, if you're using ldaps. Default: `localhost`

Array of hostnames or IP addresses of the LDAP server(s). Note that this needs to match the name(s) in the LDAP

server certificate, if you're using ldaps. Default: [`localhost`]



##### `port`

Port to connect to the LDAP server on. Default: `389`

manifests/ldap.pp

+3 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ define freeradius::ldap ( 
  $identity,

  $password,

  $basedn,

  $server      = 'localhost',

  $server      = ['localhost'],

  $port        = 389,

  $uses        = 0,

  $idle        = 60,
@@ -29,8 +29,8 @@ define freeradius::ldap ( 


  # Validate our inputs

  # Hostnames

  unless (is_domain_name($server) or is_ip_address($server)) {

    fail('$server must be a valid hostname or IP address')

  unless is_array($server) {

    fail('$server must be an array of hostnames or IP addresses')

  }



  # Fake booleans (FR uses yes/no instead of true/false)

templates/ldap.fr2.erb

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ ldap <%= @name %> { 
	#

	#  Note that this needs to match the name in the LDAP

	#  server certificate, if you're using ldaps.

	server = "<%= @server %>"

<% @server.each do |srv| -%>	server = "<%= srv %>"

<% end -%>

	identity = "<%= @identity %>"

	password = <%= @password %>

	basedn = "<%= @basedn %>"

templates/ldap.fr3.erb

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ ldap <%= @name %> { 
	#  - ldaps:// (LDAP over SSL)

	#  - ldapi:// (LDAP over Unix socket)

	#  - ldapc:// (Connectionless LDAP)

	server = '<%= @server %>'

<% @server.each do |srv| -%>	server = '<%= srv %>'

<% end -%>

#	server = 'ldap.rrdns.example.org'

#	server = 'ldap.rrdns.example.org'