Make "cadir" and "certdir" globals

diff --git a/raddb/modules/eap b/raddb/modules/eap
index 4c9a661..237d8be 100644 (file)
--- a/raddb/modules/eap
+++ b/raddb/modules/eap
@@ -149,12 +149,6 @@
                #  ANYONE who has a certificate signed by them can
                #  authenticate via EAP-TLS!  This is likely not what you want.
                tls {
-                       #
-                       #  These is used to simplify later configurations.
-                       #
-                       certdir = ${confdir}/certs
-                       cadir = ${confdir}/certs
-
                        private_key_password = whatever
                        private_key_file = ${certdir}/server.pem
 

diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in
index 2220532..baa8cfa 100644 (file)
--- a/raddb/radiusd.conf.in
+++ b/raddb/radiusd.conf.in
@@ -66,6 +66,8 @@ name = radiusd
 
 #  Location of config and logfiles.
 confdir = ${raddbdir}
+certdir = ${raddbdir}/certs
+cadir   = ${raddbdir}/certs
 run_dir = ${localstatedir}/run/${name}
 
 # Should likely be ${localstatedir}/lib/radiusd

diff --git a/raddb/sites-available/tls b/raddb/sites-available/tls
index 7327500..128130b 100644 (file)
--- a/raddb/sites-available/tls
+++ b/raddb/sites-available/tls
@@ -19,12 +19,6 @@ listen {
        #  idea to use different server certificates for EAP and for RADIUS
        #  transport.
        tls {
-               #
-               #  These is used to simplify later configurations.
-               #
-               certdir = ${confdir}/certs
-               cadir = ${confdir}/certs
-
                private_key_password = whatever
                private_key_file = ${certdir}/server.pem
 
@@ -275,12 +269,6 @@ home_server tls {
        status_check = status-server
 
        tls {
-               #
-               #  These is used to simplify later configurations.
-               #
-               certdir = ${confdir}/certs
-               cadir = ${confdir}/certs
-
                private_key_password = whatever
                private_key_file = ${certdir}/client.pem