Take out FR2 support for clients.conf

manifests/client.pp

@@ -39,7 +39,7 @@ define freeradius::client (
     mode    => '0640',
     owner   => 'root',
     group   => $fr_group,
-    content => template("freeradius/client.conf.fr${fr_version}.erb"),
+    content => template('freeradius/client.conf.erb'),
     require => [File["${fr_basepath}/clients.d"], Group[$fr_group]],
     notify  => Service[$fr_service],
   }

manifests/statusclient.pp

@@ -32,7 +32,7 @@ define freeradius::statusclient (
     mode    => '0640',
     owner   => 'root',
     group   => $fr_group,
-    content => template("freeradius/client.conf.fr${fr_version}.erb"),
+    content => template('freeradius/client.conf.erb'),
     require => [File["${fr_basepath}/clients.d"], Package[$fr_package], Group[$fr_group]],
     notify  => Service[$fr_service],
   }

templates/client.conf.fr2.erb

-client <%= @shortname %> {
-	<% if @ip %>ipaddr = <%= @ip %><% end %>
-	<% if @ip6 %>ipv6addr = <%= @ip6 %><% end %>
-	<% if @netmask %>netmask = <%= @netmask %><% end %>
-	shortname = <%= @shortname %>
-	secret = "<%= @secret %>"
-	<% if @virtual_server %>virtual_server = <%= @virtual_server %><% end %>
-	<% if @nastype %>nastype = <%= @nastype %><% end %>
-	require_message_authenticator = no
-}