diff -Naur --exclude '*.orig' --exclude '*.rej' freeradius-server-2.1.4/raddb/eap.conf freeradius-server-2.1.4-config/raddb/eap.conf --- freeradius-server-2.1.4/raddb/eap.conf 2009-03-11 03:26:50.000000000 +0100 +++ freeradius-server-2.1.4-config/raddb/eap.conf 2009-03-17 12:24:23.000000000 +0100 @@ -148,11 +148,11 @@ # # These is used to simplify later configurations. # - certdir = ${confdir}/certs - cadir = ${confdir}/certs + system_ssldir = /etc/pki/tls + local_ssldir = ${confdir}/certs - private_key_password = whatever - private_key_file = ${certdir}/server.pem + private_key_password = + private_key_file = ${system_ssldir}/private/radiusd.pem # If Private key & Certificate are located in # the same file, then private_key_file & @@ -164,7 +164,7 @@ # only the server certificate, but ALSO all # of the CA certificates used to sign the # server certificate. - certificate_file = ${certdir}/server.pem + certificate_file = ${system_ssldir}/certs/radiusd.pem # Trusted Root CA list # @@ -181,7 +181,7 @@ # not use client certificates, and you do not want # to permit EAP-TLS authentication, then delete # this configuration item. - CA_file = ${cadir}/ca.pem + CA_file = ${system_ssldir}/certs/ca-bundle.crt # # For DH cipher suites to work, you have to @@ -189,8 +189,8 @@ # # openssl dhparam -out certs/dh 1024 # - dh_file = ${certdir}/dh - random_file = ${certdir}/random + dh_file = ${local_ssldir}/dh + random_file = ${local_ssldir}/random # # This can never exceed the size of a RADIUS @@ -251,15 +251,6 @@ cipher_list = "DEFAULT" # - - # This configuration entry should be deleted - # once the server is running in a normal - # configuration. It is here ONLY to make - # initial deployments easier. - # - make_cert_command = "${certdir}/bootstrap" - - # # Session resumption / fast reauthentication # cache. #