From df20e009613aeef7bb28cb8494e1b319526b35a0 Mon Sep 17 00:00:00 2001
From: Daniel STAN <daniel.stan@crans.org>
Date: Mon, 17 Nov 2014 20:24:42 +0100
Subject: [PATCH] freeradius: definition du fichier clients.conf

---
 Bundler/freeradius.xml             |  1 +
 Python/etc/freeradius/clients.conf | 42 ++++++++++++++++++++++++------
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/Bundler/freeradius.xml b/Bundler/freeradius.xml
index 0faa1ca..1162cd0 100644
--- a/Bundler/freeradius.xml
+++ b/Bundler/freeradius.xml
@@ -1,4 +1,5 @@
 <Bundle name="freeradius">
+  <Python name="/etc/freeradius/clients.conf" />
   <Group name="wifi-auth">
     <!-- Ce fichier n'est nécessaire que pour l'auth wifi (eap)
          en filaire, on utilise un script custom (qui se connecte
diff --git a/Python/etc/freeradius/clients.conf b/Python/etc/freeradius/clients.conf
index 929fe9b..99cbb3a 100644
--- a/Python/etc/freeradius/clients.conf
+++ b/Python/etc/freeradius/clients.conf
@@ -2,12 +2,38 @@
 
 include("secrets")
 
-#info["owner"] = "root"
-#info["group"] = "freeradius"
-#info["perms"] = 0640
+info["owner"] = "root"
+info["group"] = "adm"
+info["perms"] = 0640
 
-if has("radius-server") :
-	@# Les switchs                                                              
-	@client 10.231.136.0/24 {                                                   
-	%       secret          = secrets.radius_key
-	@		 shortname       = switchs
+# TODO: dehardcoder les IPs
+print """
+# Les switchs
+client netmask {
+    ipaddr = 10.231.136.0
+    netmask = 24
+    secret = %(wired_secret)s
+    shortname = switchs
+}
+
+# Les bornes wifi
+client netmask {
+    ipaddr = 138.231.148.0
+    netmask = 24
+    secret = %(wifi_secret)s
+    shortname = wifi
+    nastype = other
+}
+
+# Les bornes wifi (en ipv6)
+client netmask {
+    ipv6addr = fda8:5d34:a228:c04::
+    netmask = 64
+    secret = %(wifi_secret)s
+    shortname = wifi
+    nastype = other
+}
+""" % {
+  'wired_secret': secrets.radius_key,
+  'wifi_secret': secrets.radius_eap_key,
+}