From 9ba16bc71cf4152494e1d0f37445566509bc9c53 Mon Sep 17 00:00:00 2001
From: Jonathan Gazeley <jonathan.gazeley@bristol.ac.uk>
Date: Mon, 1 Feb 2016 10:20:22 +0000
Subject: [PATCH] Take out FR2 support for clients.conf
---
manifests/client.pp | 2 +-
manifests/statusclient.pp | 2 +-
templates/{client.conf.fr3.erb => client.conf.erb} | 0
templates/client.conf.fr2.erb | 10 ----------
4 files changed, 2 insertions(+), 12 deletions(-)
rename templates/{client.conf.fr3.erb => client.conf.erb} (100%)
delete mode 100644 templates/client.conf.fr2.erb
diff --git a/manifests/client.pp b/manifests/client.pp
index 542b9f9..0c8b805 100644
--- a/manifests/client.pp
+++ b/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],
}
diff --git a/manifests/statusclient.pp b/manifests/statusclient.pp
index 962140c..89f1ad1 100644
--- a/manifests/statusclient.pp
+++ b/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],
}
diff --git a/templates/client.conf.fr3.erb b/templates/client.conf.erb
similarity index 100%
rename from templates/client.conf.fr3.erb
rename to templates/client.conf.erb
diff --git a/templates/client.conf.fr2.erb b/templates/client.conf.fr2.erb
deleted file mode 100644
index 591751f..0000000
--- a/templates/client.conf.fr2.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-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
-}
--
GitLab