Change raddbdir to confdir for consistency.

diff --git a/raddb/eap.conf b/raddb/eap.conf
index dda0697..2c0b497 100644 (file)
--- a/raddb/eap.conf
+++ b/raddb/eap.conf
@@ -131,8 +131,8 @@
                        #
                        #  These is used to simplify later configurations.
                        #
-                       certdir = ${raddbdir}/certs
-                       cadir = ${raddbdir}/certs
+                       certdir = ${confdir}/certs
+                       cadir = ${confdir}/certs
 
                        private_key_password = whatever
                        private_key_file = ${certdir}/server.pem

diff --git a/raddb/experimental.conf b/raddb/experimental.conf
index 83b9a0a..b7424d4 100644 (file)
--- a/raddb/experimental.conf
+++ b/raddb/experimental.conf
@@ -88,7 +88,7 @@
        #  filename, but don't check if it's already there.
        #
        dbm {
-               usersfile = ${raddbdir}/users_db
+               usersfile = ${confdir}/users_db
        }
 
        #
@@ -231,7 +231,7 @@
        # cache-rejects: Do we also cache rejects, or not? (default 'yes')
        #
        caching {
-               filename = ${raddbdir}/db.cache
+               filename = ${confdir}/db.cache
                cache-ttl = 1d
                hit-ratio = 1000
                key = "%{Acct-Unique-Session-Id}"

diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in
index b665283..e55e533 100644 (file)
--- a/raddb/radiusd.conf.in
+++ b/raddb/radiusd.conf.in
@@ -754,7 +754,7 @@ $INCLUDE eap.conf
 
                # Mapping of RADIUS dictionary attributes to LDAP
                # directory attributes.
-               dictionary_mapping = ${raddbdir}/ldap.attrmap
+               dictionary_mapping = ${confdir}/ldap.attrmap
 
                #  Set password_attribute = nspmPassword to get the
                #  user's password from a Novell eDirectory
@@ -1407,7 +1407,7 @@ $INCLUDE eap.conf
        #  'check-name' attribute.
        #
        counter daily {
-               filename = ${raddbdir}/db.daily
+               filename = ${confdir}/db.daily
                key = User-Name
                count-attribute = Acct-Session-Time
                reset = daily
@@ -1702,11 +1702,11 @@ $INCLUDE eap.conf
 
                # session-db:
                #       The main db file used to allocate addresses.
-               session-db = ${raddbdir}/db.ippool
+               session-db = ${confdir}/db.ippool
 
                # ip-index:
                #       Helper db index file used in multilink
-               ip-index = ${raddbdir}/db.ipindex
+               ip-index = ${confdir}/db.ipindex
 
                # override:
                #       If set, the Framed-IP-Address already in the