aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-02-19 03:58:44 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-02-19 03:58:44 +0000
commit482b510bdd2c319f135af1d2bd39740744cbef7d (patch)
tree10b2856e0c745865f8311b52d9df6670a2c54b9b
parent1f0ee084fcf9bd9c802f6682881c449a6ebd45df (diff)
downloadpfsense-packages-482b510bdd2c319f135af1d2bd39740744cbef7d.tar.gz
pfsense-packages-482b510bdd2c319f135af1d2bd39740744cbef7d.tar.bz2
pfsense-packages-482b510bdd2c319f135af1d2bd39740744cbef7d.zip
Update Colin's FreeRADIUS package
-rw-r--r--packages/freeradius.xml9
-rw-r--r--packages/freeradiusclients.xml11
-rw-r--r--packages/freeradiussettings.xml12
3 files changed, 21 insertions, 11 deletions
diff --git a/packages/freeradius.xml b/packages/freeradius.xml
index 65575026..1fc1c028 100644
--- a/packages/freeradius.xml
+++ b/packages/freeradius.xml
@@ -10,16 +10,16 @@
<tabs>
<tab>
<text>Users</text>
- <url>/pkg_edit.php?xml=freeradius.xml</url>
+ <url>/pkg.php?xml=freeradius.xml</url>
<active/>
</tab>
<tab>
<text>Clients</text>
- <url>/pkg_edit.php?xml=freeradiusclients.xml</url>
+ <url>/pkg.php?xml=freeradiusclients.xml</url>
</tab>
<tab>
<text>Settings</text>
- <url>/pkg_edit.php?xml=freeradiussettings.xml</url>
+ <url>/pkg_edit.php?xml=freeradiussettings.xml&amp;id=1</url>
</tab>
</tabs>
<additional_files_needed>
@@ -81,6 +81,8 @@
}
}
fclose($fout);
+ mwexec("killall radiusd");
+ mwexec("/usr/local/etc/rc.d/radiusd.sh");
}
sync_package();
</custom_php_command_before_form>
@@ -89,3 +91,4 @@
</custom_add_php_command>
</packagegui>
+
diff --git a/packages/freeradiusclients.xml b/packages/freeradiusclients.xml
index 05f3fa45..c5999572 100644
--- a/packages/freeradiusclients.xml
+++ b/packages/freeradiusclients.xml
@@ -4,16 +4,16 @@
<tabs>
<tab>
<text>Users</text>
- <url>/pkg_edit.php?xml=freeradius.xml</url>
+ <url>/pkg.php?xml=freeradius.xml</url>
</tab>
<tab>
<text>Clients</text>
- <url>/pkg_edit.php?xml=freeradiusclients.xml</url>
+ <url>/pkg.php?xml=freeradiusclients.xml</url>
<active/>
</tab>
<tab>
<text>Settings</text>
- <url>/pkg_edit.php?xml=freeradiussettings.xml</url>
+ <url>/pkg_edit.php?xml=freeradiussettings.xml&amp;id=1</url>
</tab>
</tabs>
<configpath>installedpackages->package->$packagename->configuration->settings</configpath>
@@ -61,13 +61,15 @@
function sync_package() {
global $config;
$fout = fopen("/usr/local/etc/raddb/clients.conf","w");
+ fwrite($fout, "client 127.0.0.1" . "{\n" . "secret = pfsense\n" . "shortname = localhost\n}\n\n");
if($config['installedpackages']['freeradiusclients']['config'] != "") {
- fwrite($fout, "client 127.0.0.1" . "{\n" . "secret = pfsense\n" . "shortname = localhost\n}\n\n");
foreach($config['installedpackages']['freeradiusclients']['config'] as $rowhelper) {
fwrite($fout, "client " . $rowhelper['client'] . "{\n" . "secret = " . $rowhelper['sharedsecret'] . "\nshortname = " . $rowhelper['shortname'] . "\n}\n\n");
}
}
fclose($fout);
+ mwexec("killall radiusd");
+ mwexec("/usr/local/etc/rc.d/radiusd");
}
sync_package();
</custom_php_command_before_form>
@@ -76,3 +78,4 @@
</custom_add_php_command>
</packagegui>
+
diff --git a/packages/freeradiussettings.xml b/packages/freeradiussettings.xml
index 1087a3ce..94a815ef 100644
--- a/packages/freeradiussettings.xml
+++ b/packages/freeradiussettings.xml
@@ -1,18 +1,19 @@
<packagegui>
<name>freeradiussettings</name>
<title>FreeRADIUS: Settings</title>
+ <aftersaveredirect>pkg_edit.php?xml=freeradiussettings.xml&amp;id=1</aftersaveredirect>
<tabs>
<tab>
<text>Users</text>
- <url>/pkg_edit.php?xml=freeradius.xml</url>
+ <url>/pkg.php?xml=freeradius.xml</url>
</tab>
<tab>
<text>Clients</text>
- <url>/pkg_edit.php?xml=freeradiusclients.xml</url>
+ <url>/pkg.php?xml=freeradiusclients.xml</url>
</tab>
<tab>
<text>Settings</text>
- <url>/pkg_edit.php?xml=freeradiussettings.xml</url>
+ <url>/pkg_edit.php?xml=freeradiussettings.xml&amp;id=1</url>
<active/>
</tab>
</tabs>
@@ -27,7 +28,7 @@
<field>
<fielddescr>Port</fielddescr>
<fieldname>port</fieldname>
- <description>Enter the desired port here</description>
+ <description>Enter the desired port here (default 1812)</description>
<type>input</type>
</field>
</fields>
@@ -58,6 +59,8 @@
}
}
fclose($fout);
+ mwexec("killall radiusd");
+ mwexec("/usr/local/etc/rc.d/radiusd");
}
sync_package();
</custom_php_command_before_form>
@@ -66,3 +69,4 @@
</custom_add_php_command>
</packagegui>
+