Commit fdd3d3d4 authored by Jonathan Gazeley's avatar Jonathan Gazeley
Browse files

Tidy up the FR3 template so more variables are exposed. Fix non-printing characters.

parent ebe60105

manifests/ldap.pp

+16 −18
Original line number Diff line number Diff line
@@ -15,13 +15,11 @@ define freeradius::ldap ( 
  $max         = '${thread[pool].max_servers}',

  $spare       = '${thread[pool].max_spare_servers}',

  $ensure      = 'present',



  $starttls    = 'no',

  $cafile      = '',

  $certfile    = '',

  $keyfile     = '',

  $requirecert = 'allow',



) {

  $fr_package          = $::freeradius::params::fr_package

  $fr_service          = $::freeradius::params::fr_service

templates/ldap.fr3.erb

+12 −7
Original line number Diff line number Diff line
@@ -21,12 +21,12 @@ ldap <%= @name %> { 
#	server = 'ldap.rrdns.example.org'



	#  Port to connect on, defaults to 389, will be ignored for LDAP URIs.

#	port = <%= @port %>

	port = <%= @port %>



	#  Administrator account for searching and possibly modifying.

	#  If using SASL + KRB5 these should be commented out.

#	identity = '<%= @identity %>'

#	password = mypass

	identity = '<%= @identity %>'

	password = '<%= @password %>'



	#  Unless overridden in another section, the dn from which all

	#  searches will start from.
@@ -503,11 +503,16 @@ ldap <%= @name %> { 
		# using ldaps (port 636) connections

		start_tls = <%= @starttls %>



<% if @cafile %>		ca_file	= <%= @cafile %><% end %>



<% if @cafile != '' -%>

		ca_file	= <%= @cafile %>

<% end -%>

#		ca_path	= ${certdir}

<% if @certfile %>		certificate_file = <%= @certfile %><% end %>

<% if @keyfile %>		private_key_file = <%= @keyfile %><% end %>

<% if @certfile != '' -%>

		certificate_file = <%= @certfile %>

<% end -%>

<% if @keyfile != '' -%>

		private_key_file = <%= @keyfile %>

<% end -%>

#		random_file = /dev/urandom



		#  Certificate Verification requirements.  Can be: