diff --git a/raddb/sites-available/check-eap-tls b/raddb/sites-available/check-eap-tls
deleted file mode 100644
index 3b8e2acb1341..000000000000
--- a/raddb/sites-available/check-eap-tls
+++ /dev/null
@@ -1,125 +0,0 @@
-#  -*- text -*-
-#  $Id$
-
-#######################################################################
-#
-#  This virtual server allows EAP-TLS to reject access requests
-#  based on some attributes of the certificates involved.
-#
-#  To use this virtual server, you must enable it in the tls
-#  section of mods-enabled/eap as well as adding a link to this
-#  file in sites-enabled/.
-#
-#
-#  Value-pairs that are available for checking include these
-#  attributes in the session-state list:
-#
-#   TLS-Client-Cert-Subject
-#   TLS-Client-Cert-Issuer
-#   TLS-Client-Cert-Common-Name
-#   TLS-Client-Cert-Subject-Alt-Name-Email
-#
-#  To see a full list of attributes, run the server in debug mode
-#  with this virtual server configured, and look at the attributes
-#  passed in to this virtual server.
-#
-#
-#  This virtual server is also useful when using EAP-TLS as it is
-#  only called once, just before the final Accept is about to be
-#  returned from eap, whereas the outer authorize section is called
-#  multiple times for each challenge / response. For this reason,
-#  here may be a good location to put authentication logging, and
-#  modules that check for further authorization, especially if they
-#  hit external services such as sql or ldap.
-
-server check-eap-tls {
-
-#
-#  Authorize - this is the only section required.
-#
-#  To accept the access request, set Auth-Type = ::Accept, otherwise
-#  set it to Reject.
-
-recv Access-Request {
-
-	#
-	#  By default, we just accept the request:
-	#
-	&control.Auth-Type := ::Accept
-
-	#
-	#  Check the client certificate matches a string, and reject otherwise
-	#
-
-#	if ("%{session-state.TLS-Client-Cert-Common-Name}" == 'client.example.com') {
-#		&control.Auth-Type := ::Accept
-#	}
-#	else {
-#		&control.Auth-Type := ::Reject
-#		&reply.Reply-Message := "Your certificate is not valid."
-#	}
-
-
-	#
-	#  Check the client certificate common name against the supplied User-Name
-	#
-#	if (&User-Name == "host/%{session-state.TLS-Client-Cert-Common-Name}") {
-#		&control.Auth-Type := ::Accept
-#	}
-#	else {
-#		&control.Auth-Type := ::Reject
-#	}
-
-
-	#
-	#  This is a convenient place to call LDAP, for example, when using
-	#  EAP-TLS, as it will only be called once, after all certificates as
-	#  part of the EAP-TLS challenge process have been verified.
-	#
-	#  An example could be to use LDAP to check that the connecting host, as
-	#  well as presenting a valid certificate, is also in a group based on
-	#  the User-Name (assuming this contains the service principal name).
-	#  Settings such as the following could be used in the ldap module
-	#  configuration:
-	#
-	#  basedn = "dc=example, dc=com"
-	#  filter = "(servicePrincipalName=%{User-Name})"
-	#  base_filter = "(objectClass=computer)"
-	#  groupname_attribute = cn
-	#  groupmembership_filter = "(&(objectClass=group)(member=%{control.Ldap-UserDn}))"
-	#
-
-#	ldap
-
-	#
-	#  Now let's test membership of an LDAP group (the ldap bind user will
-	#  need permission to read this group membership):
-	#
-
-#	if (!(Ldap-Group == "Permitted-Laptops")) {
-#		&control.Auth-Type := ::Reject
-#	}
-
-	#  or, to be more specific, you could use the group's full DN:
-	#  if (!(Ldap-Group == "CN=Permitted-Laptops,OU=Groups,DC=example,DC=org")) {
-
-	#
-	#  This may be a better place to call the files modules when using
-	#  EAP-TLS, as it will only be called once, after the challenge-response
-	#  iteration has completed.
-	#
-
-#	files
-
-	#
-	#  Log all request attributes, plus TLS certificate details, to the
-	#  auth_log file. Again, this is just once per connection request, so
-	#  may be preferable than in the outer authorize section. It is
-	#  suggested that 'auth_log' also be in the outer post-auth and
-	#  Post-Auth REJECT sections to log reply packet details, too.
-	#
-
-	auth_log
-}
-}
-
diff --git a/raddb/sites-available/tls-cache b/raddb/sites-available/tls-cache
index 2a441c484f4f..f56926434b98 100644
--- a/raddb/sites-available/tls-cache
+++ b/raddb/sites-available/tls-cache
@@ -43,6 +43,60 @@ server tls-cache {
 	#  to fail.
 	#
 	verify certificate {
+		#
+		#  Check the client certificate matches a string, and reject otherwise
+		#
+#		if ("%{session-state.TLS-Client-Cert-Common-Name}" != 'client.example.com') {
+#			reject
+#		}
+
+		#
+		#  Check the client certificate common name against the supplied identity
+		#
+#		if (&EAP-Identity != "host/%{session-state.TLS-Client-Cert-Common-Name}") {
+#			reject
+#		}
+
+		#
+		#  This is a convenient place to call LDAP, for example, when using
+		#  EAP-TLS, as it will only be called once, after all certificates as
+		#  part of the EAP-TLS challenge process have been verified.
+		#
+		#  An example could be to use LDAP to check that the connecting host, as
+		#  well as presenting a valid certificate, is also in a group based on
+		#  the EAP-Identity (assuming this contains the service principal name).
+		#  Settings such as the following could be used in the ldap module
+		#  configuration:
+		#
+		#  basedn = "dc=example, dc=com"
+		#  filter = "(servicePrincipalName=%{EAP-Identity})"
+		#  base_filter = "(objectClass=computer)"
+		#  groupname_attribute = cn
+		#  groupmembership_filter = "(&(objectClass=group)(member=%{control.Ldap-UserDn}))"
+		#
+
+#		ldap
+
+		#
+		#  Now let's test membership of an LDAP group (the ldap bind user will
+		#  need permission to read this group membership):
+		#
+
+#		if (!%ldap.group("Permitted-Laptops")) {
+#			reject
+#		}
+
+		#  or, to be more specific, you could use the group's full DN:
+		#  if (!%ldap.group("CN=Permitted-Laptops,OU=Groups,DC=example,DC=org")) {
+
+		#
+		#  This may be a better place to call the files modules when using
+		#  EAP-TLS, as it will only be called once, after the challenge-response
+		#  iteration has completed.
+		#
+
+#		files
+
 		ok
 	}