From 893dd62c4dc33c2fcd1c47cbb21dcb831706051a Mon Sep 17 00:00:00 2001 From: jim-p Date: Tue, 27 Mar 2012 15:42:07 -0400 Subject: Generalize the firewall's name in user-visible spots of the FreeRADIUS2 package. --- config/freeradius2/freeradius.inc | 4 ++-- config/freeradius2/freeradius.xml | 2 +- config/freeradius2/freeradiusauthorizedmacs.xml | 2 +- config/freeradius2/freeradiuscerts.xml | 2 +- config/freeradius2/freeradiuseapconf.xml | 14 +++++++------- config/freeradius2/freeradiusmodulesldap.xml | 8 ++++---- 6 files changed, 16 insertions(+), 16 deletions(-) (limited to 'config/freeradius2') diff --git a/config/freeradius2/freeradius.inc b/config/freeradius2/freeradius.inc index 21beb20f..3dd6da00 100644 --- a/config/freeradius2/freeradius.inc +++ b/config/freeradius2/freeradius.inc @@ -2573,7 +2573,7 @@ function freeradius_do_xmlrpc_sync($sync_to_ip, $password, $varsyncport, $varsyn $cli->setCredentials('admin', $password); $resp = $cli->send($msg, "150"); if(!$resp) { - $error = "A communications error occurred while FreeRADIUS was attempting XMLRPC sync with {$url}:{$port} (pfsense.exec_php)."; + $error = "A communications error occurred while FreeRADIUS was attempting XMLRPC sync with {$url}:{$port} (exec_php)."; log_error($error); file_notice("sync_settings", $error, "freeradius Settings Sync", ""); } elseif($resp->faultCode()) { @@ -2583,7 +2583,7 @@ function freeradius_do_xmlrpc_sync($sync_to_ip, $password, $varsyncport, $varsyn log_error($error); file_notice("sync_settings", $error, "freeradius Settings Sync", ""); } else { - log_error("FreeRADIUS: XMLRPC has reloaded data successfully on {$url}:{$port} (pfsense.exec_php)."); + log_error("FreeRADIUS: XMLRPC has reloaded data successfully on {$url}:{$port} (exec_php)."); } } diff --git a/config/freeradius2/freeradius.xml b/config/freeradius2/freeradius.xml index fbd47013..72ac5b1d 100644 --- a/config/freeradius2/freeradius.xml +++ b/config/freeradius2/freeradius.xml @@ -262,7 +262,7 @@ Redirection URL varuserswisprredirectionurl - + input diff --git a/config/freeradius2/freeradiusauthorizedmacs.xml b/config/freeradius2/freeradiusauthorizedmacs.xml index f9d9abe9..5b858db0 100644 --- a/config/freeradius2/freeradiusauthorizedmacs.xml +++ b/config/freeradius2/freeradiusauthorizedmacs.xml @@ -215,7 +215,7 @@ Redirection URL varmacsswisprredirectionurl - + input diff --git a/config/freeradius2/freeradiuscerts.xml b/config/freeradius2/freeradiuscerts.xml index e3f6365d..21f18643 100644 --- a/config/freeradius2/freeradiuscerts.xml +++ b/config/freeradius2/freeradiuscerts.xml @@ -124,7 +124,7 @@ This page uses the freeradius2 built-in script called "bootstrap" to create CA and certs. The disatvantage of this script is that nothing of your changes will be saved in the global config.xml file. So after a systemcrash or reinstallation of freeradius2 package all your CA and certs will be lost. If you have a backup of all these files on an USB stick or another server than you can copy them back in the freeradius certs folder.

- The better way is to use the pfsense built-in Cert Manager (SYSTEM-> Cert Manager). The CA-Cert and Server-Cert you created there you just have to choose in EAP. + The better way is to use the firewall's built-in Cert Manager (SYSTEM-> Cert Manager). The CA-Cert and Server-Cert you created there you just have to choose in EAP. The advantage of this is that all your CA and certs will be saved in global config.xml and can be restored.]]> input diff --git a/config/freeradius2/freeradiuseapconf.xml b/config/freeradius2/freeradiuseapconf.xml index b5358c37..ac761523 100644 --- a/config/freeradius2/freeradiuseapconf.xml +++ b/config/freeradius2/freeradiuseapconf.xml @@ -164,26 +164,26 @@ listtopic - Choose pfSense Cert-Manager + Choose Cert-Manager vareapconfchoosecertmanager - To use the pfsense Cert Manager you have to create a CA and an Server Certificate first. (SYSTEM -> Cert Manager).

+ To use the firewall's built-in Cert Manager you have to create a CA and an Server Certificate first. (SYSTEM -> Cert Manager).

uncheked: FreeRADIUS Cert-Manager (not recommended) (Default: unchecked)
- cheked: pfSense Cert-Manager (recommended)]]> + cheked: Firewall Cert-Manager (recommended)]]> checkbox ssl_ca_cert,ssl_server_cert,vareapconfenableclientp12 Private Key Password vareapconfprivatekeypassword - + password whatever SSL CA Certificate ssl_ca_cert - + Choose "none" if you do not use any kind of certificates or the freeradius Cert Manager. (Default: none)]]> select_source @@ -193,7 +193,7 @@ SSL Server Certificate ssl_server_cert - + Choose "none" if you do not use any kind of certificates or the freeradius Cert Manager. (Default: none)]]> select_source @@ -210,7 +210,7 @@ SSL Client Certificate ssl_client_cert - + Choose "none" if you do not use any kind of certificates or the freeradius Cert Manager. (Default: none)]]> select_source diff --git a/config/freeradius2/freeradiusmodulesldap.xml b/config/freeradius2/freeradiusmodulesldap.xml index f6619afd..0fa98493 100644 --- a/config/freeradius2/freeradiusmodulesldap.xml +++ b/config/freeradius2/freeradiusmodulesldap.xml @@ -354,7 +354,7 @@ SSL CA Certificate ssl_ca_cert1 - + Choose "none" if you do not use any kind of certificates or the freeradius Cert Manager. (Default: none)]]> select_source @@ -364,7 +364,7 @@ SSL Server Certificate ssl_server_cert1 - + Choose "none" if you do not use any kind of certificates or the freeradius Cert Manager. (Default: none)]]> select_source @@ -665,7 +665,7 @@ SSL CA Certificate ssl_ca_cert2 - + Choose "none" if you do not use any kind of certificates or the freeradius Cert Manager. (Default: none)]]> select_source @@ -675,7 +675,7 @@ SSL Server Certificate ssl_server_cert2 - + Choose "none" if you do not use any kind of certificates or the freeradius Cert Manager. (Default: none)]]> select_source -- cgit v1.2.3