aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/freeradius2/freeradius.inc9
-rw-r--r--config/freeradius2/freeradius_view_config.php8
-rw-r--r--config/freeradius2/freeradiusauthorizedmacs.xml64
-rw-r--r--config/freeradius2/freeradiuscerts.xml2
-rw-r--r--config/freeradius2/freeradiusclients.xml2
-rw-r--r--config/freeradius2/freeradiuseapconf.xml2
-rw-r--r--config/freeradius2/freeradiusinterfaces.xml2
-rw-r--r--config/freeradius2/freeradiussync.xml6
-rw-r--r--pkg_config.10.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
11 files changed, 21 insertions, 80 deletions
diff --git a/config/freeradius2/freeradius.inc b/config/freeradius2/freeradius.inc
index 76da6213..8472ea5e 100644
--- a/config/freeradius2/freeradius.inc
+++ b/config/freeradius2/freeradius.inc
@@ -76,6 +76,15 @@ if ($pfs_version == "2.2") {
}
function freeradius_deinstall_command() {
+ $pidFile = "/var/run/radiusd.pid";
+ $i = 0;
+
+ while (isvalidpid($pidFile) && $i < 3) {
+ $sig = ($i == 2 ? SIGKILL : SIGTERM);
+ sigkillbypid($pidFile, $sig);
+ sleep(1);
+ $i++;
+ }
return;
}
diff --git a/config/freeradius2/freeradius_view_config.php b/config/freeradius2/freeradius_view_config.php
index 0095b009..8cdc844e 100644
--- a/config/freeradius2/freeradius_view_config.php
+++ b/config/freeradius2/freeradius_view_config.php
@@ -100,8 +100,8 @@ else{
display_top_tabs($tab_array);
?>
</td></tr>
- <tr>
- <td>
+ <tr>
+ <td>
<div id="mainarea">
<table class="tabcont" width="100%" border="0" cellpadding="8" cellspacing="0">
<tr><td></td></tr>
@@ -126,8 +126,8 @@ else{
</td>
</tr>
<tr>
- <td class="tabcont" >
- <div id="file_div"></div>
+ <td class="tabcont" >
+ <div id="file_div"></div>
</td>
</tr>
diff --git a/config/freeradius2/freeradiusauthorizedmacs.xml b/config/freeradius2/freeradiusauthorizedmacs.xml
index 594e7398..3a643a86 100644
--- a/config/freeradius2/freeradiusauthorizedmacs.xml
+++ b/config/freeradius2/freeradiusauthorizedmacs.xml
@@ -45,7 +45,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>freeradiusauthorizedmacs</name>
- <version>2.1.12</version>
+ <version>2.2.0</version>
<title>FreeRADIUS: MACs</title>
<include_file>/usr/local/pkg/freeradius.inc</include_file>
<menu>
@@ -54,13 +54,6 @@
<section>Services</section>
<url>/pkg.php?xml=freeradiusauthorizedmacs.xml</url>
</menu>
- <service>
- <name>radiusd</name>
- <rcfile>radiusd.sh</rcfile>
- <executable>radiusd</executable>
- <description><![CDATA[FreeRADIUS Server]]></description>
- </service>
-
<tabs>
<tab>
<text>Users</text>
@@ -108,61 +101,6 @@
<url>/pkg_edit.php?xml=freeradiussync.xml&amp;id=0</url>
</tab>
</tabs>
- <additional_files_needed>
- <prefix>/usr/local/pkg/</prefix>
- <chmod>0755</chmod>
- <item>https://packages.pfsense.org/packages/config/freeradius2/freeradius.inc</item>
- </additional_files_needed>
- <additional_files_needed>
- <prefix>/usr/local/www/</prefix>
- <chmod>0755</chmod>
- <item>https://packages.pfsense.org/packages/config/freeradius2/freeradius_view_config.php</item>
- </additional_files_needed>
- <additional_files_needed>
- <prefix>/usr/local/pkg/</prefix>
- <chmod>0755</chmod>
- <item>https://packages.pfsense.org/packages/config/freeradius2/freeradiusclients.xml</item>
- </additional_files_needed>
- <additional_files_needed>
- <prefix>/usr/local/pkg/</prefix>
- <chmod>0755</chmod>
- <item>https://packages.pfsense.org/packages/config/freeradius2/freeradiussettings.xml</item>
- </additional_files_needed>
- <additional_files_needed>
- <prefix>/usr/local/pkg/</prefix>
- <chmod>0755</chmod>
- <item>https://packages.pfsense.org/packages/config/freeradius2/freeradiuseapconf.xml</item>
- </additional_files_needed>
- <additional_files_needed>
- <prefix>/usr/local/pkg/</prefix>
- <chmod>0755</chmod>
- <item>https://packages.pfsense.org/packages/config/freeradius2/freeradiussqlconf.xml</item>
- </additional_files_needed>
- <additional_files_needed>
- <prefix>/usr/local/pkg/</prefix>
- <chmod>0755</chmod>
- <item>https://packages.pfsense.org/packages/config/freeradius2/freeradiusinterfaces.xml</item>
- </additional_files_needed>
- <additional_files_needed>
- <prefix>/usr/local/pkg/</prefix>
- <chmod>0755</chmod>
- <item>https://packages.pfsense.org/packages/config/freeradius2/freeradiuscerts.xml</item>
- </additional_files_needed>
- <additional_files_needed>
- <prefix>/usr/local/pkg/</prefix>
- <chmod>0755</chmod>
- <item>https://packages.pfsense.org/packages/config/freeradius2/freeradiussync.xml</item>
- </additional_files_needed>
- <additional_files_needed>
- <prefix>/usr/local/pkg/</prefix>
- <chmod>0755</chmod>
- <item>https://packages.pfsense.org/packages/config/freeradius2/freeradiusmodulesldap.xml</item>
- </additional_files_needed>
- <additional_files_needed>
- <prefix>/usr/local/pkg/</prefix>
- <chmod>0755</chmod>
- <item>https://packages.pfsense.org/packages/config/freeradius2/freeradiusauthorizedmacs.xml</item>
- </additional_files_needed>
<adddeleteeditpagefields>
<columnitem>
<fielddescr>MAC Address</fielddescr>
diff --git a/config/freeradius2/freeradiuscerts.xml b/config/freeradius2/freeradiuscerts.xml
index 4909411a..9899d19f 100644
--- a/config/freeradius2/freeradiuscerts.xml
+++ b/config/freeradius2/freeradiuscerts.xml
@@ -45,7 +45,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>freeradiuscerts</name>
- <version>none</version>
+ <version>2.2.0</version>
<title>FreeRADIUS: Certificates</title>
<aftersaveredirect>pkg_edit.php?xml=freeradiuscerts.xml&amp;id=0</aftersaveredirect>
<include_file>/usr/local/pkg/freeradius.inc</include_file>
diff --git a/config/freeradius2/freeradiusclients.xml b/config/freeradius2/freeradiusclients.xml
index 99ac2af1..16d8d1e9 100644
--- a/config/freeradius2/freeradiusclients.xml
+++ b/config/freeradius2/freeradiusclients.xml
@@ -45,7 +45,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>freeradiusclients</name>
- <version>none</version>
+ <version>2.2.0</version>
<title>FreeRADIUS: Clients</title>
<include_file>/usr/local/pkg/freeradius.inc</include_file>
<tabs>
diff --git a/config/freeradius2/freeradiuseapconf.xml b/config/freeradius2/freeradiuseapconf.xml
index a5ea88bd..8f81094a 100644
--- a/config/freeradius2/freeradiuseapconf.xml
+++ b/config/freeradius2/freeradiuseapconf.xml
@@ -46,7 +46,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>freeradiuseapconf</name>
- <version>none</version>
+ <version>2.2.0</version>
<title>FreeRADIUS: EAP</title>
<aftersaveredirect>pkg_edit.php?xml=freeradiuseapconf.xml&amp;id=0</aftersaveredirect>
<include_file>/usr/local/pkg/freeradius.inc</include_file>
diff --git a/config/freeradius2/freeradiusinterfaces.xml b/config/freeradius2/freeradiusinterfaces.xml
index 5427f988..0538633a 100644
--- a/config/freeradius2/freeradiusinterfaces.xml
+++ b/config/freeradius2/freeradiusinterfaces.xml
@@ -45,7 +45,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>freeradiusinterfaces</name>
- <version>none</version>
+ <version>2.2.0</version>
<title>FreeRADIUS: Interfaces</title>
<include_file>/usr/local/pkg/freeradius.inc</include_file>
<tabs>
diff --git a/config/freeradius2/freeradiussync.xml b/config/freeradius2/freeradiussync.xml
index be678e5a..61c7eecb 100644
--- a/config/freeradius2/freeradiussync.xml
+++ b/config/freeradius2/freeradiussync.xml
@@ -56,12 +56,6 @@ POSSIBILITY OF SUCH DAMAGE.
<section>Services</section>
<url>/pkg.php?xml=freeradiussync.xml</url>
</menu>
- <service>
- <name>FreeRADIUS</name>
- <rcfile>radiusd.sh</rcfile>
- <executable>radiusd</executable>
- <description><![CDATA[The FreeRADIUS daemon.]]></description>
- </service>
<tabs>
<tab>
<text>Users</text>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 9e25457b..3023763d 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -886,7 +886,7 @@
On pfSense docs there is a how-to which could help you on porting users.]]></descr>
<pkginfolink>https://doc.pfsense.org/index.php/FreeRADIUS_2.x_package</pkginfolink>
<category>System</category>
- <version>1.6.13</version>
+ <version>1.6.14</version>
<status>RC1</status>
<required_version>2.2</required_version>
<maintainer>nachtfalkeaw@web.de</maintainer>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index cc2b6625..22dd3af6 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1041,7 +1041,7 @@
On pfSense docs there is a how-to which could help you on porting users.]]></descr>
<pkginfolink>https://doc.pfsense.org/index.php/FreeRADIUS_2.x_package</pkginfolink>
<category>System</category>
- <version>1.6.13</version>
+ <version>1.6.14</version>
<status>RC1</status>
<required_version>2.1</required_version>
<maintainer>nachtfalkeaw@web.de</maintainer>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index a1681c9d..db285614 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1028,7 +1028,7 @@
On pfSense docs there is a how-to which could help you on porting users.]]></descr>
<pkginfolink>https://doc.pfsense.org/index.php/FreeRADIUS_2.x_package</pkginfolink>
<category>System</category>
- <version>1.6.13</version>
+ <version>1.6.14</version>
<status>RC1</status>
<required_version>2.1</required_version>
<maintainer>nachtfalkeaw@web.de</maintainer>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 04:18:35 +0000