aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/cron/cron.inc2
-rw-r--r--config/filemgr/filemgr.inc4
-rwxr-xr-xconfig/haproxy-legacy/haproxy_global.php2
-rwxr-xr-xconfig/haproxy/haproxy_global.php2
-rw-r--r--config/nut/nut.inc6
-rw-r--r--config/phpservice/phpservice.inc11
-rw-r--r--config/phpsysinfo/phpsysinfo.inc4
-rw-r--r--config/shellcmd/shellcmd.inc23
-rw-r--r--config/spamd/spamd.inc5
-rw-r--r--config/spamd/spamd_db.php4
-rw-r--r--config/tinc/tinc.inc6
-rw-r--r--config/vhosts/vhosts.inc7
-rw-r--r--pkg_config.10.xml16
-rw-r--r--pkg_config.8.xml2
14 files changed, 11 insertions, 83 deletions
diff --git a/config/cron/cron.inc b/config/cron/cron.inc
index 0c7c6769..a457cf58 100644
--- a/config/cron/cron.inc
+++ b/config/cron/cron.inc
@@ -61,7 +61,6 @@ function cron_install_command() {
global $config;
conf_mount_rw();
- config_lock();
//write_config();
@@ -79,7 +78,6 @@ function cron_install_command() {
//}
conf_mount_ro();
- config_unlock();
}
diff --git a/config/filemgr/filemgr.inc b/config/filemgr/filemgr.inc
index 56d34a60..64186637 100644
--- a/config/filemgr/filemgr.inc
+++ b/config/filemgr/filemgr.inc
@@ -35,7 +35,6 @@ function php_install_command_fm()
global $config;
conf_mount_rw();
- config_lock();
if (!is_dir('/usr/local/www/packages/')) {
exec("mkdir /usr/local/www/packages/");
@@ -132,7 +131,6 @@ function php_install_command_fm()
conf_mount_ro();
- config_unlock();
}
@@ -151,4 +149,4 @@ function deinstall_command_fm()
conf_mount_ro();
}
-?> \ No newline at end of file
+?>
diff --git a/config/haproxy-legacy/haproxy_global.php b/config/haproxy-legacy/haproxy_global.php
index 4ea03c75..59d26503 100755
--- a/config/haproxy-legacy/haproxy_global.php
+++ b/config/haproxy-legacy/haproxy_global.php
@@ -46,9 +46,7 @@ if ($_POST) {
if ($_POST['apply']) {
$retval = 0;
- config_lock();
$retval = haproxy_configure();
- config_unlock();
$savemsg = get_std_save_message($retval);
unlink_if_exists($d_haproxyconfdirty_path);
} else {
diff --git a/config/haproxy/haproxy_global.php b/config/haproxy/haproxy_global.php
index 40b5cd90..5ea4010c 100755
--- a/config/haproxy/haproxy_global.php
+++ b/config/haproxy/haproxy_global.php
@@ -45,9 +45,7 @@ if ($_POST) {
if ($_POST['apply']) {
$retval = 0;
- config_lock();
$retval = haproxy_configure();
- config_unlock();
$savemsg = get_std_save_message($retval);
unlink_if_exists($d_haproxyconfdirty_path);
} else {
diff --git a/config/nut/nut.inc b/config/nut/nut.inc
index fbc75a30..e0ca9d30 100644
--- a/config/nut/nut.inc
+++ b/config/nut/nut.inc
@@ -512,13 +512,13 @@ EOD;
$return = sync_package_nut_snmp();
}
- if ($return && $_POST['monitor']) {
- /* only start if changing settings as we have a startup script for system boot */
+ if ((!platform_booting()) && (nut_config('monitor'))) {
+ /* only start if enabled and system is not booting */
/* this prevents service from starting / stopping / starting on boot */
log_error("[nut] INFO: Starting service");
start_service("nut");
- if ((int)exec('/bin/pgrep upsmon | /usr/bin/wc -l') == 0) {
+ if (!is_process_running('upsmon')) {
log_error("[nut] ERROR: Service failed to start: check configuration.");
}
} elseif (!$return && file_exists(NUT_RCFILE)) {
diff --git a/config/phpservice/phpservice.inc b/config/phpservice/phpservice.inc
index 6236d0b6..ec2b9bef 100644
--- a/config/phpservice/phpservice.inc
+++ b/config/phpservice/phpservice.inc
@@ -67,8 +67,7 @@ function phpservice_sync_package_php()
if($config['installedpackages']['phpservice']['config'] != "") {
conf_mount_rw();
- config_unlock();
-
+
$tmp = "<?php\n";
$tmp .= "\n";
$tmp .= "// Set time limit to indefinite execution\n";
@@ -169,7 +168,6 @@ function phpservice_install_command()
global $config;
conf_mount_rw();
- config_lock();
if (!is_dir('/usr/local/www/packages/')) {
exec("mkdir /usr/local/www/packages/");
@@ -205,8 +203,7 @@ function phpservice_install_command()
//}
conf_mount_ro();
- config_unlock();
-
+
}
@@ -214,15 +211,13 @@ function phpservice_deinstall_command()
{
conf_mount_rw();
- config_lock();
$handle = popen("/usr/local/etc/rc.d/phpservice.sh stop", "r");
unlink_if_exists("/usr/local/pkg/phpservice.xml");
unlink_if_exists("/usr/local/pkg/phpservice.inc");
unlink_if_exists("/usr/local/www/phpservice.inc");
unlink_if_exists("/usr/local/etc/rc.d/phpservice.sh");
conf_mount_ro();
- config_unlock();
-
+
}
?>
diff --git a/config/phpsysinfo/phpsysinfo.inc b/config/phpsysinfo/phpsysinfo.inc
index f6b8d264..54ece241 100644
--- a/config/phpsysinfo/phpsysinfo.inc
+++ b/config/phpsysinfo/phpsysinfo.inc
@@ -1,17 +1,14 @@
<?php
function phpsysinfo_install_deinstall() {
conf_mount_rw();
- config_lock();
exec("cd /var/db/pkg/ && pkg_delete `ls | grep mbmon`");
exec("rm -d -R /usr/local/www/phpsysinfo");
conf_mount_ro();
- config_unlock();
}
function phpsysinfo_install_config() {
global $config, $g;
conf_mount_rw();
- config_lock();
exec("cd ..");
exec("tar -zxovf /usr/local/pkg/phpsysinfo-2.5.4.tar.gz");
exec("mv phpsysinfo /usr/local/www/phpsysinfo");
@@ -155,6 +152,5 @@ fwrite($hf, '?>');
fwrite($hf, "\n");
fclose($hf);
conf_mount_ro();
- config_unlock();
}
?>
diff --git a/config/shellcmd/shellcmd.inc b/config/shellcmd/shellcmd.inc
index c5020d5f..04cbf3d6 100644
--- a/config/shellcmd/shellcmd.inc
+++ b/config/shellcmd/shellcmd.inc
@@ -69,26 +69,9 @@ function shellcmd_install_command()
global $config;
conf_mount_rw();
- config_lock();
-
- //write_config();
-
- //write_rcfile(array(
- // "file" => "shellcmd.sh",
- // "start" => "/usr/sbin/shellcmd -s &",
- // "stop" => "kill -9 `cat /var/run/shellcmd.pid`"
- // )
- //);
-
shellcmd_sync_package();
-
- //if (pkg_is_service_running('shellcmd')) {
- //documentation purposes
- //}
-
conf_mount_ro();
- config_unlock();
-
+
}
@@ -96,12 +79,10 @@ function shellcmd_deinstall_command()
{
conf_mount_rw();
- config_lock();
$handle = popen("/usr/local/etc/rc.d/shellcmd.sh stop", "r");
//unlink_if_exists("/usr/local/etc/rc.d/shellcmd.sh");
conf_mount_ro();
- config_unlock();
-
+
}
?>
diff --git a/config/spamd/spamd.inc b/config/spamd/spamd.inc
index 71f20106..bbfae23e 100644
--- a/config/spamd/spamd.inc
+++ b/config/spamd/spamd.inc
@@ -43,7 +43,6 @@ function sync_package_spamd() {
}
conf_mount_rw();
- config_lock();
$fd = fopen("/etc/spamd.conf","w");
/* all header */
fwrite($fd, "all:\\\n\t:whitelist:blacklist");
@@ -155,8 +154,6 @@ function sync_package_spamd() {
spamd_install_cron(true);
log_error("Mounting RO");
conf_mount_ro();
- log_error("Unlocking config");
- config_unlock();
log_error("Restart cron");
mwexec("killall -HUP cron");
log_error("Setting up spamd.conf symlink");
@@ -176,7 +173,6 @@ function sync_package_spamd() {
function sync_package_spamd_whitelist() {
global $config;
conf_mount_rw();
- config_lock();
/* write out ip to the whitelist db */
$fd = fopen("/var/db/whitelist.txt","w");
if($config['installedpackages']['spamdwhitelist']['config'] != "") {
@@ -189,7 +185,6 @@ function sync_package_spamd_whitelist() {
mwexec("/usr/bin/killall -HUP spamlogd");
mwexec("/sbin/pfctl -t spamd-white -T add {$spamd['ip']}");
conf_mount_ro();
- config_unlock();
}
function spamd_generate_rules($type) {
diff --git a/config/spamd/spamd_db.php b/config/spamd/spamd_db.php
index e1d004f7..83601805 100644
--- a/config/spamd/spamd_db.php
+++ b/config/spamd/spamd_db.php
@@ -145,7 +145,6 @@ if($_GET['whitelist'] <> "") {
}
function delete_from_blacklist($srcip) {
- config_lock();
$blacklist = explode("\n", file_get_contents("/var/db/blacklist.txt"));
$fd = fopen("/var/db/blacklist.txt", "w");
foreach($blacklist as $bl) {
@@ -156,11 +155,9 @@ function delete_from_blacklist($srcip) {
fclose($fd);
mwexec("/sbin/pfctl -q -t spamd -T delete {$srcip}");
mwexec("/sbin/pfctl -q -t blacklist -T replace -f /var/db/blacklist.txt");
- config_unlock();
}
function delete_from_whitelist($srcip) {
- config_lock();
$whitelist = explode("\n", file_get_contents("/var/db/whitelist.txt"));
$fd = fopen("/var/db/whitelist.txt", "w");
foreach($whitelist as $wl) {
@@ -171,7 +168,6 @@ function delete_from_whitelist($srcip) {
fclose($fd);
mwexec("/sbin/pfctl -q -t spamd -T delete $srcip");
mwexec("/sbin/pfctl -q -t whitelist -T replace -f /var/db/whitelist.txt");
- config_unlock();
}
$pgtitle = "SpamD: Database";
diff --git a/config/tinc/tinc.inc b/config/tinc/tinc.inc
index 717ce967..82d5b453 100644
--- a/config/tinc/tinc.inc
+++ b/config/tinc/tinc.inc
@@ -26,7 +26,6 @@ if (!function_exists('clear_log_file')) {
function tinc_save() {
global $config;
conf_mount_rw();
- config_lock();
exec("/bin/mv -f /usr/local/etc/tinc /usr/local/etc/tinc.old");
safe_mkdir("/usr/local/etc/tinc");
safe_mkdir("/usr/local/etc/tinc/hosts");
@@ -127,7 +126,6 @@ function tinc_save() {
rmdir_recursive("/usr/local/etc/tinc.old");
conf_mount_ro();
- config_unlock();
}
function tinc_install() {
@@ -142,7 +140,6 @@ function tinc_install() {
clear_log_file("/var/log/tinc.log");
conf_mount_rw();
- config_lock();
/* Create Interface Group */
if (!is_array($config['ifgroups']['ifgroupentry']))
@@ -161,14 +158,12 @@ function tinc_install() {
write_config();
conf_mount_ro();
- config_unlock();
}
function tinc_deinstall() {
global $config;
/* Remove Interface Group */
conf_mount_rw();
- config_lock();
if (!is_array($config['ifgroups']['ifgroupentry']))
$config['ifgroups']['ifgroupentry'] = array();
@@ -200,7 +195,6 @@ function tinc_deinstall() {
write_config();
}
conf_mount_ro();
- config_unlock();
rmdir_recursive("/var/tmp/tinc");
rmdir_recursive("/usr/local/etc/tinc*");
diff --git a/config/vhosts/vhosts.inc b/config/vhosts/vhosts.inc
index 1958632e..4cbbb61d 100644
--- a/config/vhosts/vhosts.inc
+++ b/config/vhosts/vhosts.inc
@@ -106,7 +106,6 @@ function vhosts_sync_package_php()
if($config['installedpackages']['vhosts']['config'] != "") {
conf_mount_rw();
- config_unlock();
//sort the vhosts array
$vhostarray = $config['installedpackages']['vhosts']['config'];
@@ -718,7 +717,6 @@ function vhosts_install_command() {
global $config;
conf_mount_rw();
- config_lock();
if (!is_dir('/usr/local/www/packages/')) {
exec("mkdir /usr/local/www/packages/");
@@ -794,15 +792,13 @@ function vhosts_install_command() {
//}
conf_mount_ro();
- config_unlock();
-
+
}
function vhosts_deinstall_command()
{
conf_mount_rw();
- config_lock();
$handle = popen("/usr/local/etc/rc.d/vhosts.sh stop", "r");
unlink_if_exists("/usr/local/pkg/vhosts.xml");
unlink_if_exists("/usr/local/pkg/vhosts.inc");
@@ -813,7 +809,6 @@ function vhosts_deinstall_command()
exec("rm -R /usr/local/www/packages/vhosts");
exec("rm -R /usr/local/php5");
conf_mount_ro();
- config_unlock();
}
?>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index a368b8e7..c66d2b96 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -90,20 +90,6 @@
<maximum_version>2.2.999</maximum_version>
</package>
<package>
- <name>Strikeback</name>
- <descr>Detect port scans with iplog and strike back.</descr>
- <pkginfolink>https://forum.pfsense.org/index.php/topic,37225.0.html</pkginfolink>
- <category>Services</category>
- <version>0.1</version>
- <status>BETA</status>
- <required_version>2.2</required_version>
- <maintainer>tom@tomschaefer.org</maintainer>
- <config_file>https://packages.pfsense.org/packages/config/strikeback/strikeback.xml</config_file>
- <configurationfile>strikeback.xml</configurationfile>
- <only_for_archs>i386</only_for_archs>
- <maximum_version>2.2.999</maximum_version>
- </package>
- <package>
<name>File Manager</name>
<internal_name>File_Manager</internal_name>
<descr>PHP File Manager.</descr>
@@ -828,7 +814,7 @@
<descr>Network UPS Tools.</descr>
<website>http://www.networkupstools.org/</website>
<category>Network Management</category>
- <version>2.0.6</version>
+ <version>2.0.7</version>
<status>BETA</status>
<required_version>2.2</required_version>
<maintainer>rswagoner@gmail.com</maintainer>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index e204a59c..2e14d8df 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -89,8 +89,6 @@
<version>0.1</version>
<status>BETA</status>
<required_version>2.0</required_version>
- <!-- Disabling on 2.2 since it calls pkg_add/pkg_delete, plus broken in general -->
- <maximum_version>2.1.5</maximum_version>
<maintainer>tom@tomschaefer.org</maintainer>
<config_file>https://packages.pfsense.org/packages/config/strikeback/strikeback.xml</config_file>
<configurationfile>strikeback.xml</configurationfile>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 20:41:38 +0000