aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packages/carp.xml6
-rw-r--r--packages/freeradius.xml4
-rw-r--r--packages/freeradiusclients.xml6
-rw-r--r--packages/pfstat.xml6
-rw-r--r--packages/siproxd.xml11
-rw-r--r--packages/siproxdusers.xml7
-rw-r--r--packages/spamd.xml6
-rw-r--r--packages/spamd_whitelist.xml6
-rw-r--r--packages/stunnel.xml58
9 files changed, 58 insertions, 52 deletions
diff --git a/packages/carp.xml b/packages/carp.xml
index 87fec638..67ce9d00 100644
--- a/packages/carp.xml
+++ b/packages/carp.xml
@@ -228,7 +228,7 @@
</field>
</fields>
<custom_php_command_before_form>
- function sync_package() {
+ function sync_package_carp() {
/*
* XXX: find out how many carp and pfsync interfaces are established
* and destroy/down them before sweeping through the list
@@ -283,10 +283,10 @@
}
</custom_php_command_before_form>
<custom_php_resync_config_command>
- sync_package();
+ sync_package_carp();
</custom_php_resync_config_command>
<custom_delete_php_command>
- sync_package();
+ sync_package_carp();
</custom_delete_php_command>
<custom_php_install_command>
</custom_php_install_command>
diff --git a/packages/freeradius.xml b/packages/freeradius.xml
index e49e098e..e33f2837 100644
--- a/packages/freeradius.xml
+++ b/packages/freeradius.xml
@@ -79,7 +79,7 @@
mwexec("/usr/local/etc/rc.d/radiusd.sh");
</custom_php_install_command>
<custom_php_command_before_form>
- function sync_package()
+ function sync_package_freeradius()
{
conf_mount_rw();
config_lock();
@@ -98,7 +98,7 @@
}
</custom_php_command_before_form>
<custom_add_php_command>
- sync_package();
+ sync_package_freeradius();
system("/usr/bin/killall -HUP radiusd");
</custom_add_php_command>
</packagegui>
diff --git a/packages/freeradiusclients.xml b/packages/freeradiusclients.xml
index d26b792a..5deaf64d 100644
--- a/packages/freeradiusclients.xml
+++ b/packages/freeradiusclients.xml
@@ -58,7 +58,7 @@
</field>
</fields>
<custom_php_command_before_form>
- function sync_package() {
+ function sync_package_freeradius_clients() {
conf_mount_rw();
config_lock();
global $config;
@@ -75,10 +75,10 @@
config_unlock();
system("killall -HUP radiusd");
}
- sync_package();
+ sync_package_freeradius_clients();
</custom_php_command_before_form>
<custom_add_php_command>
- sync_package();
+ sync_package_freeradius_clients();
</custom_add_php_command>
</packagegui>
diff --git a/packages/pfstat.xml b/packages/pfstat.xml
index f95e5b19..ec4756fd 100644
--- a/packages/pfstat.xml
+++ b/packages/pfstat.xml
@@ -205,7 +205,7 @@
</field>
</fields>
<custom_php_command_before_form>
- function sync_package() {
+ function sync_package_pfstat() {
conf_mount_rw();
config_lock();
global $config;
@@ -255,12 +255,12 @@
conf_mount_ro();
config_unlock();
}
- sync_package();
+ sync_package_pfstat();
</custom_php_command_before_form>
<custom_add_php_command_late>
</custom_add_php_command_late>
<custom_php_resync_config_command>
- sync_package();
+ sync_package_pfstat();
</custom_php_resync_config_command>
<custom_php_install_command>
system("mkdir -p /usr/local/www/pfstat 2>/dev/null");
diff --git a/packages/siproxd.xml b/packages/siproxd.xml
index 7d769899..d35488bc 100644
--- a/packages/siproxd.xml
+++ b/packages/siproxd.xml
@@ -63,7 +63,7 @@
<field>
<fielddescr>RTP port range (lower)</fielddescr>
<fieldname>rtplower</fieldname>
- <description>Enter the bottom edge of the port range siproxd will allocate for incoming RTP traffic. This range must be one not blocked by the firewall (default 7070).</description>
+ <description>Enter the bottom edge of the port range siproxd will allocate for incoming RTP traffic. This range must be one not blocked by the firewall (default 7070).</description>
<type>input</type>
</field>
<field>
@@ -92,7 +92,7 @@
</field>
<field>
<fielddescr>Outbound proxy hostname</fielddescr>
- <fieldname>outboundproxyhost</fieldname>
+ <fieldname>outboundproxyhost</fieldname>
<type>input</type>
<description>Enter the hostname of an outbound proxy to send all traffic to. This is only useful if you have multiple masquerading firewalls to cross.</description>
</field>
@@ -110,8 +110,11 @@
fwrite($fout, "#!/bin/sh\n\n/usr/local/sbin/siproxd\n");
fclose($fout);
</custom_php_install_command>
+ <custom_php_resync_config_command>
+ sync_package_sipproxd();
+ </custom_php_resync_config_command>
<custom_add_php_command>
- function sync_package() {
+ function sync_package_sipproxd() {
conf_mount_rw();
config_lock();
global $config;
@@ -166,7 +169,7 @@
conf_mount_ro();
config_unlock();
}
- sync_package();
+ sync_package_sipproxd();
</custom_add_php_command>
</packagegui>
diff --git a/packages/siproxdusers.xml b/packages/siproxdusers.xml
index 9209bf84..27803d04 100644
--- a/packages/siproxdusers.xml
+++ b/packages/siproxdusers.xml
@@ -44,8 +44,11 @@
<type>input</type>
</field>
</fields>
+ <custom_php_resync_config_command>
+ sync_package_sipproxd_users();
+ </custom_php_resync_config_command>
<custom_add_php_command>
- function sync_package()
+ function sync_package_sipproxd_users()
{
conf_mount_rw();
config_lock();
@@ -62,7 +65,7 @@
config_unlock();
system("/usr/bin/killall -HUP siproxd");
}
- sync_package();
+ sync_package_sipproxd_users();
</custom_add_php_command>
</packagegui>
diff --git a/packages/spamd.xml b/packages/spamd.xml
index 524168b6..625150e3 100644
--- a/packages/spamd.xml
+++ b/packages/spamd.xml
@@ -95,7 +95,7 @@
</field>
</fields>
<custom_php_command_before_form>
- function sync_package() {
+ function sync_package_spamd() {
conf_mount_rw();
config_lock();
global $config;
@@ -134,10 +134,10 @@
}
</custom_php_command_before_form>
<custom_php_resync_config_command>
- sync_package();
+ sync_package_spamd();
</custom_php_resync_config_command>
<custom_delete_php_command>
- sync_package();
+ sync_package_spamd();
</custom_delete_php_command>
<custom_php_install_command>
system("touch /var/mail/whitelist.txt 2>/dev/null");
diff --git a/packages/spamd_whitelist.xml b/packages/spamd_whitelist.xml
index aacb3aa8..1fb463cf 100644
--- a/packages/spamd_whitelist.xml
+++ b/packages/spamd_whitelist.xml
@@ -51,7 +51,7 @@
</field>
</fields>
<custom_php_command_before_form>
- function sync_package() {
+ function sync_package_spamd_whitelist() {
global $config;
conf_mount_rw();
config_lock();
@@ -67,9 +67,9 @@
}
</custom_php_command_before_form>
<custom_php_resync_config_command>
- sync_package();
+ sync_package_spamd_whitelist();
</custom_php_resync_config_command>
<custom_delete_php_command>
- sync_package();
+ sync_package_spamd_whitelist();
</custom_delete_php_command>
</packagegui>
diff --git a/packages/stunnel.xml b/packages/stunnel.xml
index c07eea0e..253da369 100644
--- a/packages/stunnel.xml
+++ b/packages/stunnel.xml
@@ -72,38 +72,38 @@
</field>
</fields>
<custom_php_install_command>
- system("mkdir /usr/local/etc/stunnel 2>/dev/null");
- system("mkdir /var/tmp/stunnel 2>/dev/null");
- system("/usr/bin/openssl req -new -x509 -days 365 -nodes -out /usr/local/etc/stunnel/stunnel.pem -keyout /usr/local/etc/stunnel/stunnel.pem 2>/dev/null");
- system("chmod a-r /usr/local/etc/stunnel/stunnel.pem");
- system("chmod u+r /usr/local/etc/stunnel/stunnel.pem");
- system("mkdir -p /var/tmp/stunnel/var/tmp");
- system("chmod a+rw /var/tmp/stunnel/var/tmp/.");
- system("mv /usr/local/etc/rc.d/stunnel.sh.sample /usr/local/etc/rc.d/stunnel.sh");
- system("chmod 555 /usr/local/etc/rc.d/stunnel.sh");
+ system("mkdir /usr/local/etc/stunnel 2>/dev/null");
+ system("mkdir /var/tmp/stunnel 2>/dev/null");
+ system("/usr/bin/openssl req -new -x509 -days 365 -nodes -out /usr/local/etc/stunnel/stunnel.pem -keyout /usr/local/etc/stunnel/stunnel.pem 2>/dev/null");
+ system("chmod a-r /usr/local/etc/stunnel/stunnel.pem");
+ system("chmod u+r /usr/local/etc/stunnel/stunnel.pem");
+ system("mkdir -p /var/tmp/stunnel/var/tmp");
+ system("chmod a+rw /var/tmp/stunnel/var/tmp/.");
+ system("mv /usr/local/etc/rc.d/stunnel.sh.sample /usr/local/etc/rc.d/stunnel.sh");
+ system("chmod 555 /usr/local/etc/rc.d/stunnel.sh");
</custom_php_install_command>
<custom_php_deinstall_command>
- system("rm -rf /var/tmp/stunnel 2>/dev/null");
- system("rm -rf /usr/local/etc/stunnel*");
+ system("rm -rf /var/tmp/stunnel 2>/dev/null");
+ system("rm -rf /usr/local/etc/stunnel*");
</custom_php_deinstall_command>
<custom_add_php_command_late>
- conf_mount_rw();
- config_lock();
- $fout = fopen("/usr/local/etc/stunnel/stunnel.conf","w");
- fwrite($fout, "cert = /usr/local/etc/stunnel/mail.pem \n");
- fwrite($fout, "chroot = /var/tmp/stunnel \n");
- fwrite($fout, "setuid = stunnel \n");
- fwrite($fout, "setgid = stunnel \n");
- foreach($config['installedpackages']['stunnel']['config'] as $pkgconfig) {
- fwrite($fout, "\n[" . $pkgconfig['description'] . "]\n");
- fwrite($fout, "accept = " . $pkgconfig['localip'] . ":" . $pkgconfig['localport'] . "\n");
- fwrite($fout, "connect = " . $pkgconfig['redirectip'] . ":" . $pkgconfig['redirectport'] . "\n");
- fwrite($fout, "TIMEOUTclose = 0\n\n");
- }
- fclose($fout);
- conf_mount_ro();
- config_unlock();
- system("/usr/bin/killall stunnel 2>/dev/null");
- system("/usr/local/etc/rc.d/stunnel.sh start 2>/dev/null");
+ conf_mount_rw();
+ config_lock();
+ $fout = fopen("/usr/local/etc/stunnel/stunnel.conf","w");
+ fwrite($fout, "cert = /usr/local/etc/stunnel/mail.pem \n");
+ fwrite($fout, "chroot = /var/tmp/stunnel \n");
+ fwrite($fout, "setuid = stunnel \n");
+ fwrite($fout, "setgid = stunnel \n");
+ foreach($config['installedpackages']['stunnel']['config'] as $pkgconfig) {
+ fwrite($fout, "\n[" . $pkgconfig['description'] . "]\n");
+ fwrite($fout, "accept = " . $pkgconfig['localip'] . ":" . $pkgconfig['localport'] . "\n");
+ fwrite($fout, "connect = " . $pkgconfig['redirectip'] . ":" . $pkgconfig['redirectport'] . "\n");
+ fwrite($fout, "TIMEOUTclose = 0\n\n");
+ }
+ fclose($fout);
+ conf_mount_ro();
+ config_unlock();
+ system("/usr/bin/killall stunnel 2>/dev/null");
+ system("/usr/local/etc/rc.d/stunnel.sh start 2>/dev/null");
</custom_add_php_command_late>
</packagegui>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 11:26:21 +0000