aboutsummaryrefslogtreecommitdiffstats
path: root/config/freeradius2
diff options
context:
space:
mode:
Diffstat (limited to 'config/freeradius2')
-rw-r--r--config/freeradius2/freeradius.inc68
-rw-r--r--config/freeradius2/freeradius.xml1
-rw-r--r--config/freeradius2/freeradius_view_config.php12
-rw-r--r--config/freeradius2/freeradiusauthorizedmacs.xml1
-rw-r--r--config/freeradius2/freeradiusclients.xml1
-rw-r--r--config/freeradius2/freeradiusinterfaces.xml1
6 files changed, 50 insertions, 34 deletions
diff --git a/config/freeradius2/freeradius.inc b/config/freeradius2/freeradius.inc
index d2f42dfd..0e31b8d1 100644
--- a/config/freeradius2/freeradius.inc
+++ b/config/freeradius2/freeradius.inc
@@ -46,25 +46,15 @@ require_once("filter.inc");
require_once("services.inc");
// Check to find out on which system the package is running
-if (exec("uname -r | cut -c 1-3") == '8.3') {
- if (exec("uname -m") == "i386") {
- define('RADDB', '/usr/pbi/freeradius-i386/etc/raddb');
- define('USRLOCAL', '/usr/pbi/freeradius-i386');
- }
- else {
- define('RADDB', '/usr/pbi/freeradius-amd64/etc/raddb');
- define('USRLOCAL', '/usr/pbi/freeradius-amd64');
- }
-}
-else {
+if (substr(trim(file_get_contents("/etc/version")),0,3) == "2.0") {
define('RADDB', '/usr/local/etc/raddb');
define('USRLOCAL', '/usr/local');
+} else {
+ define('RADDB', '/usr/pbi/freeradius-' . php_uname("m") . '/etc/raddb');
+ define('USRLOCAL', '/usr/pbi/freeradius-' . php_uname("m"));
}
// End of system check
-
-// define('RADDB', '/usr/local/etc/raddb');
-
function freeradius_deinstall_command() {
exec("cd /var/db/pkg && pkg_delete `ls | grep freeradius`");
exec("rm -rf " . RADDB);
@@ -75,6 +65,10 @@ function freeradius_install_command() {
global $config;
conf_mount_rw();
+ // put the constant to a variable
+ $varRADDB = RADDB;
+ $varUSRLOCAL = USRLOCAL;
+
// We create here different folders for different counters.
if (!file_exists("/var/log/radacct/datacounter/")) { exec("mkdir /var/log/radacct/datacounter && mkdir /var/log/radacct/datacounter/daily && mkdir /var/log/radacct/datacounter/weekly && mkdir /var/log/radacct/datacounter/monthly && mkdir /var/log/radacct/datacounter/forever"); }
if (!file_exists("/var/log/radacct/timecounter/")) { exec("mkdir /var/log/radacct/timecounter"); }
@@ -124,8 +118,8 @@ function freeradius_install_command() {
$rcfile = array();
$rcfile['file'] = 'radiusd.sh';
- $rcfile['start'] = USRLOCAL . '/etc/rc.d/radiusd onestart';
- $rcfile['stop'] = USRLOCAL . '/etc/rc.d/radiusd onestop';
+ $rcfile['start'] = "$varUSRLOCAL" . '/etc/rc.d/radiusd onestart';
+ $rcfile['stop'] = "$varUSRLOCAL" . '/etc/rc.d/radiusd onestop';
write_rcfile($rcfile);
conf_mount_ro();
start_service("radiusd");
@@ -135,6 +129,10 @@ function freeradius_settings_resync() {
global $config;
$conf = '';
+ // put the constant to a variable
+ $varRADDB = RADDB;
+ $varUSRLOCAL = USRLOCAL;
+
// We do some checks of some folders which will be deleted after reboot on nanobsd systems
if (!file_exists("/var/log/radacct/")) { exec("mkdir /var/log/radacct"); }
if (!file_exists("/var/log/radacct/datacounter/")) { exec("mkdir /var/log/radacct/datacounter && mkdir /var/log/radacct/datacounter/daily && mkdir /var/log/radacct/datacounter/weekly && mkdir /var/log/radacct/datacounter/monthly && mkdir /var/log/radacct/datacounter/forever"); }
@@ -203,7 +201,7 @@ function freeradius_settings_resync() {
$conf .= <<<EOD
-prefix = USRLOCAL
+prefix = $varUSRLOCAL
exec_prefix = \${prefix}
sysconfdir = \${prefix}/etc
localstatedir = /var
@@ -3808,14 +3806,26 @@ function freeradius_motp_resync() {
exec("cd /var/db/pkg && pkg_delete `ls | grep bash`");
log_error('FreeRADIUS: Uninstalling package "bash-4.1.7" which comes with Mobile-One-Time-Password (motp).');
}
+ if (exec("cd /var/db/pkg && ls | grep bash") == "bash-4.2.20") {
+ exec("cd /var/db/pkg && pkg_delete `ls | grep bash`");
+ log_error('FreeRADIUS: Uninstalling package "bash-4.2.20" which comes with Mobile-One-Time-Password (motp).');
+ }
}
// check if enabled then we need to download "bash"
else {
- if (exec("cd /var/db/pkg && ls | grep bash") != "bash-4.1.7") {
- log_error('FreeRADIUS: Downloading and installing package "bash-4.1.7" to use Mobile-One-Time-Password (motp).');
- exec("pkg_add -r http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/ports/`uname -m`/packages-8.1-release/All/bash-4.1.7.tbz");
+ if (substr(trim(file_get_contents("/etc/version")),0,3) == "2.0") {
+ if (exec("cd /var/db/pkg && ls | grep bash") != "bash-4.1.7") {
+ log_error('FreeRADIUS: Downloading and installing package "bash-4.1.7" to use Mobile-One-Time-Password (motp).');
+ exec("pkg_add -r http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/ports/`uname -m`/packages-8.1-release/All/bash-4.1.7.tbz");
+ }
+ } else {
+ if (exec("cd /var/db/pkg && ls | grep bash") != "bash-4.2.20") {
+ log_error('FreeRADIUS: Downloading and installing package "bash-4.2.20" to use Mobile-One-Time-Password (motp).');
+ exec("pkg_add -r http://ftp-archive.freebsd.org/pub/FreeBSD/ports/`uname -m`/packages-8.3-release/All/bash-4.2.20.tbz");
+ }
}
+
$conf .= <<<EOD
#!/bin/bash
@@ -3950,10 +3960,14 @@ function freeradius_modulesmotp_resync() {
global $config;
$conf = '';
+ // put the constant to a variable
+ $varRADDB = RADDB;
+ $varUSRLOCAL = USRLOCAL;
+
$conf .= <<<EOD
exec motp {
wait = yes
- program = "/usr/local/bin/bash " . RADDB . "/scripts/otpverify.sh %{request:User-Name} %{request:User-Password} %{reply:MOTP-Init-Secret} %{reply:MOTP-PIN} %{reply:MOTP-Offset}"
+ program = "/usr/local/bin/bash $varRADDB/scripts/otpverify.sh %{request:User-Name} %{request:User-Password} %{reply:MOTP-Init-Secret} %{reply:MOTP-PIN} %{reply:MOTP-Offset}"
}
EOD;
@@ -3969,22 +3983,26 @@ function freeradius_modulesdatacounter_resync() {
global $config;
$conf = '';
+ // put the constant to a variable
+ $varRADDB = RADDB;
+ $varUSRLOCAL = USRLOCAL;
+
$conf .= <<<EOD
exec datacounterdaily {
wait = yes
- program = "/bin/sh " . RADDB . "/scripts/datacounter_acct.sh %{request:User-Name} daily %{request:Acct-Input-Octets} %{request:Acct-Output-Octets}"
+ program = "/bin/sh $varRADDB/scripts/datacounter_acct.sh %{request:User-Name} daily %{request:Acct-Input-Octets} %{request:Acct-Output-Octets}"
}
exec datacounterweekly {
wait = yes
- program = "/bin/sh " . RADDB . "/scripts/datacounter_acct.sh %{request:User-Name} weekly %{request:Acct-Input-Octets} %{request:Acct-Output-Octets}"
+ program = "/bin/sh $varRADDB/scripts/datacounter_acct.sh %{request:User-Name} weekly %{request:Acct-Input-Octets} %{request:Acct-Output-Octets}"
}
exec datacountermonthly {
wait = yes
- program = "/bin/sh " . RADDB . "/scripts/datacounter_acct.sh %{request:User-Name} monthly %{request:Acct-Input-Octets} %{request:Acct-Output-Octets}"
+ program = "/bin/sh $varRADDB/scripts/datacounter_acct.sh %{request:User-Name} monthly %{request:Acct-Input-Octets} %{request:Acct-Output-Octets}"
}
exec datacounterforever {
wait = yes
- program = "/bin/sh " . RADDB . "/scripts/datacounter_acct.sh %{request:User-Name} forever %{request:Acct-Input-Octets} %{request:Acct-Output-Octets}"
+ program = "/bin/sh $varRADDB/scripts/datacounter_acct.sh %{request:User-Name} forever %{request:Acct-Input-Octets} %{request:Acct-Output-Octets}"
}
EOD;
diff --git a/config/freeradius2/freeradius.xml b/config/freeradius2/freeradius.xml
index 4cdea6c3..716fd6db 100644
--- a/config/freeradius2/freeradius.xml
+++ b/config/freeradius2/freeradius.xml
@@ -200,6 +200,7 @@
<fielddescr>Description</fielddescr>
<fieldname>description</fieldname>
</columnitem>
+ <movable>text</movable>
</adddeleteeditpagefields>
<fields>
<field>
diff --git a/config/freeradius2/freeradius_view_config.php b/config/freeradius2/freeradius_view_config.php
index ee7ca4c1..a29e1a55 100644
--- a/config/freeradius2/freeradius_view_config.php
+++ b/config/freeradius2/freeradius_view_config.php
@@ -33,16 +33,10 @@
require("guiconfig.inc");
// Check to find out on which system the package is running
-if (exec("uname -r | cut -c 1-3") == '8.3') {
- if (exec("uname -m") == "i386") {
- define('RADDB', '/usr/pbi/freeradius-i386/etc/raddb');
- }
- else {
- define('RADDB', '/usr/pbi/freeradius-amd64/etc/raddb');
- }
-}
-else {
+if (substr(trim(file_get_contents("/etc/version")),0,3) == "2.0") {
define('RADDB', '/usr/local/etc/raddb');
+} else {
+ define('RADDB', '/usr/pbi/freeradius-' . php_uname("m") . '/etc/raddb');
}
// End of system check
diff --git a/config/freeradius2/freeradiusauthorizedmacs.xml b/config/freeradius2/freeradiusauthorizedmacs.xml
index 02bf2d2b..898c3e48 100644
--- a/config/freeradius2/freeradiusauthorizedmacs.xml
+++ b/config/freeradius2/freeradiusauthorizedmacs.xml
@@ -196,6 +196,7 @@
<fielddescr>Description</fielddescr>
<fieldname>description</fieldname>
</columnitem>
+ <movable>text</movable>
</adddeleteeditpagefields>
<fields>
<field>
diff --git a/config/freeradius2/freeradiusclients.xml b/config/freeradius2/freeradiusclients.xml
index 2bf24ecc..87d8a11f 100644
--- a/config/freeradius2/freeradiusclients.xml
+++ b/config/freeradius2/freeradiusclients.xml
@@ -128,6 +128,7 @@
<fielddescr>Description</fielddescr>
<fieldname>description</fieldname>
</columnitem>
+ <movable>text</movable>
</adddeleteeditpagefields>
<fields>
<field>
diff --git a/config/freeradius2/freeradiusinterfaces.xml b/config/freeradius2/freeradiusinterfaces.xml
index 5ec634f1..c944ac17 100644
--- a/config/freeradius2/freeradiusinterfaces.xml
+++ b/config/freeradius2/freeradiusinterfaces.xml
@@ -116,6 +116,7 @@
<fielddescr>Description</fielddescr>
<fieldname>description</fieldname>
</columnitem>
+ <movable>text</movable>
</adddeleteeditpagefields>
<fields>
<field>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 21:54:02 +0000