diff options
40 files changed, 35 insertions, 258 deletions
diff --git a/config/apcupsd/apcupsd.inc b/config/apcupsd/apcupsd.inc index 2b166994..e3b9b587 100644 --- a/config/apcupsd/apcupsd.inc +++ b/config/apcupsd/apcupsd.inc @@ -40,7 +40,6 @@ function php_install_apcupsd() { function php_deinstall_apcupsd() { global $config, $g; - conf_mount_rw(); $pfs_version = substr(trim(file_get_contents("/etc/version")), 0, 3); if ($pfs_version == "2.1" || $pfs_version == "2.2") { define('APCUPSD_BASE', '/usr/pbi/apcupsd-' . php_uname("m")); @@ -48,7 +47,6 @@ function php_deinstall_apcupsd() { define('APCUPSD_BASE', '/usr/local'); } - exec("/usr/bin/killall apcupsd"); unlink_if_exists(APCUPSD_BASE . "/etc/rc.d/apcupsd.sh"); unlink_if_exists(APCUPSD_BASE . "/etc/apcupsd/apcupsd.conf"); unlink_if_exists("/var/log/apcupsd/apcupsd.log"); @@ -61,7 +59,6 @@ function php_deinstall_apcupsd() { exec("/bin/rm -rf /var/run/apcupsd/"); } - conf_mount_ro(); } function validate_input_apcupsd($post, &$input_errors) { diff --git a/config/asterisk/asterisk.inc b/config/asterisk/asterisk.inc index 22a7b96c..ed835b25 100644 --- a/config/asterisk/asterisk.inc +++ b/config/asterisk/asterisk.inc @@ -42,11 +42,6 @@ function asterisk_install() { sync_package_asterisk(); } -function asterisk_deinstall() { - stop_service("asterisk"); - unlink_if_exists("/usr/local/etc/rc.d/asterisk.sh"); -} - function sync_package_asterisk() { conf_mount_rw(); diff --git a/config/asterisk/asterisk.xml b/config/asterisk/asterisk.xml index 2eef359f..97c2e26f 100644 --- a/config/asterisk/asterisk.xml +++ b/config/asterisk/asterisk.xml @@ -84,9 +84,6 @@ <custom_php_install_command> asterisk_install(); </custom_php_install_command> - <custom_php_deinstall_command> - asterisk_deinstall(); - </custom_php_deinstall_command> <custom_php_resync_config_command> sync_package_asterisk(); </custom_php_resync_config_command> diff --git a/config/avahi/avahi.inc b/config/avahi/avahi.inc index 7d69af78..4c824e71 100644 --- a/config/avahi/avahi.inc +++ b/config/avahi/avahi.inc @@ -36,8 +36,6 @@ if ($pfs_version == "2.1" || $pfs_version == "2.2") { } function avahi_install() { - conf_mount_rw(); - if (!file_exists('/usr/local/etc/gnome.subr')) { @symlink(AVAHI_BASE . '/etc/gnome.subr', '/usr/local/etc/gnome.subr'); } @@ -49,21 +47,10 @@ function avahi_install() { if (!exec("/usr/sbin/pw groupshow avahi")) { exec("/usr/sbin/pw groupadd avahi -g 558"); } - - conf_mount_ro(); } function avahi_deinstall() { - conf_mount_rw(); - - // Stop services and remove created rc script and symlink - if (is_process_running("avahi-daemon")) { - exec("/usr/bin/killall -9 avahi-daemon"); - } - if (is_process_running("dbus-daemon")) { - exec("/usr/bin/killall -9 dbus-daemon"); - } - unlink_if_exists("/usr/local/etc/rc.d/avahi-daemon.sh"); + // Remove created symlink unlink_if_exists("/usr/local/etc/gnome.subr"); // Remove created users and groups if they exist @@ -73,8 +60,6 @@ function avahi_deinstall() { if (exec("/usr/sbin/pw usershow avahi")) { exec("/usr/sbin/pw userdel avahi"); } - - conf_mount_ro(); } function avahi_write_config() { diff --git a/config/backup/backup.inc b/config/backup/backup.inc index 1a5eeab1..f77b5865 100644 --- a/config/backup/backup.inc +++ b/config/backup/backup.inc @@ -47,11 +47,9 @@ function backup_sync_package() { } function backup_install_command() { - conf_mount_rw(); // Create the backup directory safe_mkdir("/root/backup/"); backup_sync_package(); - conf_mount_ro(); } ?> diff --git a/config/bacula-client/bacula-client.inc b/config/bacula-client/bacula-client.inc index 07be3067..397cf7a4 100644 --- a/config/bacula-client/bacula-client.inc +++ b/config/bacula-client/bacula-client.inc @@ -44,15 +44,8 @@ function baculaclient_custom_php_install_command() { } function baculaclient_custom_php_deinstall_command(){ - conf_mount_rw(); - // Delete our config file unlink_if_exists(BACULA_LOCALBASE . "/etc/bacula/bacula-fd.conf"); - // Stop service and delete our rc file - stop_service("bacula-client"); - unlink_if_exists(BACULA_STARTUP_SCRIPT); - - conf_mount_ro(); } function baculaclient_custom_php_write_config(){ diff --git a/config/bacula-client/bacula-client.xml b/config/bacula-client/bacula-client.xml index ce07e77e..cbfe8757 100644 --- a/config/bacula-client/bacula-client.xml +++ b/config/bacula-client/bacula-client.xml @@ -150,6 +150,9 @@ <custom_php_install_command> baculaclient_custom_php_install_command(); </custom_php_install_command> + <custom_php_deinstall_command> + baculaclient_custom_php_deinstall_command(); + </custom_php_deinstall_command> <custom_php_resync_config_command> baculaclient_custom_php_write_config(); </custom_php_resync_config_command> diff --git a/config/bandwidthd/bandwidthd.inc b/config/bandwidthd/bandwidthd.inc index 9364cbbc..0029a05d 100644 --- a/config/bandwidthd/bandwidthd.inc +++ b/config/bandwidthd/bandwidthd.inc @@ -45,13 +45,10 @@ switch ($pfs_version) { } function bandwidthd_install_deinstall() { - conf_mount_rw(); - stop_service("bandwidthd"); mwexec("/bin/rm -rf " . PKG_BANDWIDTHD_BASE . "/htdocs"); mwexec("/bin/rm -f /usr/local/www/bandwidthd"); // Remove the cron job, if it is there install_cron_job("/bin/kill -HUP `cat /var/run/bandwidthd.pid`", false); - conf_mount_ro(); } function bandwidthd_install_config() { diff --git a/config/cron/cron.inc b/config/cron/cron.inc index 7a7a8993..645575d9 100644 --- a/config/cron/cron.inc +++ b/config/cron/cron.inc @@ -40,7 +40,6 @@ function cron_sync_package() { } function cron_install_command() { - conf_mount_rw(); // Clean up possible lingering garbage after previous package versions unlink_if_exists("/usr/local/etc/rc.d/cron.sh"); cron_sync_package(); diff --git a/config/freeradius2/freeradius.inc b/config/freeradius2/freeradius.inc index 8472ea5e..6d626e3a 100644 --- a/config/freeradius2/freeradius.inc +++ b/config/freeradius2/freeradius.inc @@ -90,8 +90,7 @@ function freeradius_deinstall_command() { function freeradius_install_command() { global $config, $frlib; - conf_mount_rw(); - + // We create here different folders for different counters. @mkdir("/var/log/radacct/datacounter/daily", 0755, true); @mkdir("/var/log/radacct/datacounter/weekly", 0755, true); @@ -186,7 +185,6 @@ SERVICENAME="radiusd" EOD; $rcfile['stop'] = FREERADIUS_ETC . '/rc.d/radiusd onestop'; write_rcfile($rcfile); - conf_mount_ro(); start_service("radiusd"); } diff --git a/config/haproxy-devel/pkg/haproxy.inc b/config/haproxy-devel/pkg/haproxy.inc index de1963b0..e9bdbf47 100644 --- a/config/haproxy-devel/pkg/haproxy.inc +++ b/config/haproxy-devel/pkg/haproxy.inc @@ -380,10 +380,6 @@ function haproxy_custom_php_install_command() { $static_output .= "HAProxy, running haproxy_custom_php_install_command()\n"; update_output_window($static_output); - $static_output .= "HAProxy, conf_mount_rw\n"; - update_output_window($static_output); - conf_mount_rw(); - $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); if ($pf_version == "2.1" || $pf_version == "2.2") $haproxy_binary = "/usr/pbi/haproxy-devel-" . php_uname("m") . "/sbin/haproxy"; @@ -488,10 +484,6 @@ EOD; require_once('haproxy_upgrade_config.inc'); haproxy_upgrade_config(); - $static_output .= "HAProxy, conf_mount_ro\n"; - update_output_window($static_output); - conf_mount_ro(); - $static_output .= "HAProxy, starting haproxy (if previously enabled)\n"; update_output_window($static_output); haproxy_check_run(1); diff --git a/config/haproxy-legacy/haproxy.inc b/config/haproxy-legacy/haproxy.inc index 9058b4a6..55b86882 100644 --- a/config/haproxy-legacy/haproxy.inc +++ b/config/haproxy-legacy/haproxy.inc @@ -69,7 +69,6 @@ function migrate_old_sync_config(){ } function haproxy_custom_php_install_command() { global $g, $config; - conf_mount_rw(); $haproxy = <<<EOD #!/bin/sh @@ -118,7 +117,6 @@ EOD; fclose($fd); exec("chmod a+rx /usr/local/etc/rc.d/haproxy.sh"); migrate_old_sync_config(); - conf_mount_ro(); exec("/usr/local/etc/rc.d/haproxy.sh start"); } diff --git a/config/haproxy-legacy/haproxy.xml b/config/haproxy-legacy/haproxy.xml index 8892c77c..99345ac5 100644 --- a/config/haproxy-legacy/haproxy.xml +++ b/config/haproxy-legacy/haproxy.xml @@ -109,7 +109,6 @@ /* included in package install $freebsdv=trim(`uname -r | cut -d'.' -f1`); - conf_mount_rw(); `fetch -q -o /usr/local/sbin/ https://packages.pfsense.org/packages/config/haproxy-legacy/binaries{$freebsdv}/haproxy`; exec("chmod a+rx /usr/local/sbin/haproxy"); */ @@ -120,4 +119,4 @@ </custom_php_deinstall_command> <custom_php_command_before_form> </custom_php_command_before_form> -</packagegui>
\ No newline at end of file +</packagegui> diff --git a/config/haproxy/haproxy.inc b/config/haproxy/haproxy.inc index 6d4ba0e5..7ededa97 100644 --- a/config/haproxy/haproxy.inc +++ b/config/haproxy/haproxy.inc @@ -73,7 +73,6 @@ function haproxy_custom_php_deinstall_command() { function haproxy_custom_php_install_command() { global $g, $config; - conf_mount_rw(); $haproxy = <<<EOD #!/bin/sh @@ -228,8 +227,6 @@ EOD; write_config(); } - conf_mount_ro(); - exec("/usr/local/etc/rc.d/haproxy.sh start"); } diff --git a/config/haproxy/haproxy.xml b/config/haproxy/haproxy.xml index 3be05802..ac8a35f2 100644 --- a/config/haproxy/haproxy.xml +++ b/config/haproxy/haproxy.xml @@ -89,17 +89,10 @@ <chmod>077</chmod> <item>https://packages.pfsense.org/packages/config/haproxy/haproxy_pool_edit.php</item> </additional_files_needed> - <custom_delete_php_command> - </custom_delete_php_command> - <custom_add_php_command> - </custom_add_php_command> - <custom_php_resync_config_command> - </custom_php_resync_config_command> <custom_php_install_command> /* included in package install $freebsdv=trim(`uname -r | cut -d'.' -f1`); - conf_mount_rw(); `fetch -q -o /usr/local/sbin/ https://packages.pfsense.org/packages/config/haproxy/binaries{$freebsdv}/haproxy`; exec("chmod a+rx /usr/local/sbin/haproxy"); */ @@ -108,6 +101,4 @@ <custom_php_deinstall_command> haproxy_custom_php_deinstall_command(); </custom_php_deinstall_command> - <custom_php_command_before_form> - </custom_php_command_before_form> </packagegui> diff --git a/config/haproxy1_5/pkg/haproxy.inc b/config/haproxy1_5/pkg/haproxy.inc index eceef783..8ba7e437 100644 --- a/config/haproxy1_5/pkg/haproxy.inc +++ b/config/haproxy1_5/pkg/haproxy.inc @@ -360,10 +360,6 @@ function haproxy_custom_php_install_command() { $static_output .= "HAProxy, running haproxy_custom_php_install_command()\n"; update_output_window($static_output); - $static_output .= "HAProxy, conf_mount_rw\n"; - update_output_window($static_output); - conf_mount_rw(); - $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); if ($pf_version == "2.1" || $pf_version == "2.2") $haproxy_binary = "/usr/pbi/haproxy-devel-" . php_uname("m") . "/sbin/haproxy"; @@ -468,10 +464,6 @@ EOD; require_once('haproxy_upgrade_config.inc'); haproxy_upgrade_config(); - $static_output .= "HAProxy, conf_mount_ro\n"; - update_output_window($static_output); - conf_mount_ro(); - $static_output .= "HAProxy, starting haproxy (if previously enabled)\n"; update_output_window($static_output); haproxy_check_run(1); diff --git a/config/notes/notes.inc b/config/notes/notes.inc deleted file mode 100644 index ddc54a3f..00000000 --- a/config/notes/notes.inc +++ /dev/null @@ -1,37 +0,0 @@ -<?php -/* - notes.inc - part of pfSense (https://www.pfSense.org/) - Copyright (C) 2008 Mark J Crane - Copyright (C) 2015 ESF, LLC - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -*/ -function notes_deinstall_command() { - conf_mount_rw(); - unlink_if_exists("/usr/local/pkg/notes.xml"); - unlink_if_exists("/usr/local/pkg/notes.inc"); - conf_mount_ro(); -} - -?> diff --git a/config/notes/notes.xml b/config/notes/notes.xml index e74a76f1..03c0a01a 100644 --- a/config/notes/notes.xml +++ b/config/notes/notes.xml @@ -45,7 +45,6 @@ <name>Notes</name> <version>0.2.6</version> <title>Settings</title> - <include_file>/usr/local/pkg/notes.inc</include_file> <menu> <name>Notes</name> <tooltiptext>Notes.</tooltiptext> @@ -61,10 +60,6 @@ </tab> </tabs> <configpath>installedpackages->package->$packagename->configuration->notes</configpath> - <additional_files_needed> - <prefix>/usr/local/pkg/</prefix> - <item>https://packages.pfsense.org/packages/config/notes/notes.inc</item> - </additional_files_needed> <adddeleteeditpagefields> <columnitem> <fielddescr>Title</fielddescr> @@ -103,7 +98,4 @@ <rows>20</rows> </field> </fields> - <custom_php_deinstall_command> - notes_deinstall_command(); - </custom_php_deinstall_command> </packagegui> diff --git a/config/nrpe2/nrpe2.inc b/config/nrpe2/nrpe2.inc index b5e6a7d9..08aeb5c4 100644 --- a/config/nrpe2/nrpe2.inc +++ b/config/nrpe2/nrpe2.inc @@ -51,7 +51,6 @@ define('NRPE_RCFILE', '/usr/local/etc/rc.d/nrpe2.sh'); function nrpe2_custom_php_install_command() { global $g, $config; - conf_mount_rw(); $NRPE_BASE = NRPE_BASE; $NRPE_CONFIG_DIR = NRPE_CONFIG_DIR; @@ -159,14 +158,6 @@ EOD; fclose($fd); chmod(NRPE_RCFILE, 0755); - conf_mount_ro(); -} - -function nrpe2_custom_php_deinstall_command() { - global $g, $config; - conf_mount_rw(); - - conf_mount_ro(); } function nrpe2_custom_php_write_config() { diff --git a/config/nrpe2/nrpe2.xml b/config/nrpe2/nrpe2.xml index 1204e8ec..f70835c3 100644 --- a/config/nrpe2/nrpe2.xml +++ b/config/nrpe2/nrpe2.xml @@ -179,7 +179,6 @@ nrpe2_custom_php_service(); </custom_php_install_command> <custom_php_deinstall_command> - nrpe2_custom_php_deinstall_command(); nrpe2_custom_php_write_config(); </custom_php_deinstall_command> <custom_php_resync_config_command> diff --git a/config/ntop2/ntop.xml b/config/ntop2/ntop.xml index 57354f61..6ba86525 100644 --- a/config/ntop2/ntop.xml +++ b/config/ntop2/ntop.xml @@ -160,9 +160,6 @@ <custom_php_install_command> sync_package_ntop(); </custom_php_install_command> - <custom_php_deinstall_command> - exec("rm /usr/local/etc/rc.d/ntop*"); - </custom_php_deinstall_command> <custom_php_validation_command> <![CDATA[ if ($_POST) { diff --git a/config/nut/nut.inc b/config/nut/nut.inc index 6467ec13..71b06932 100644 --- a/config/nut/nut.inc +++ b/config/nut/nut.inc @@ -156,9 +156,6 @@ } function deinstall_package_nut() { - stop_service("nut"); - - unlink_if_exists(NUT_RCFILE); unlink_if_exists(NUT_DIR.'/upsmon.conf'); unlink_if_exists(NUT_DIR.'/ups.conf'); unlink_if_exists(NUT_DIR.'/upsd.conf'); diff --git a/config/open-vm-tools_2/open-vm-tools.inc b/config/open-vm-tools_2/open-vm-tools.inc index f005074e..02449a1d 100644 --- a/config/open-vm-tools_2/open-vm-tools.inc +++ b/config/open-vm-tools_2/open-vm-tools.inc @@ -27,20 +27,14 @@ POSSIBILITY OF SUCH DAMAGE. */ function open_vm_tools_deinstall() { - conf_mount_rw(); - stop_service("vmware-guestd"); - unlink_if_exists("/usr/local/etc/rc.d/vmware-guestd.sh"); unlink_if_exists("/usr/local/etc/rc.d/vmware-kmod.sh"); unlink_if_exists("/boot/kernel/vmblock.ko"); unlink_if_exists("/boot/kernel/vmhgfs.ko"); unlink_if_exists("/boot/kernel/vmmemctl.ko"); unlink_if_exists("/boot/kernel/vmxnet.ko"); - conf_mount_ro(); } function open_vm_tools_install() { - conf_mount_rw(); - // Clean up old .ko files if they exist unlink_if_exists("/boot/kernel/vmblock.ko"); unlink_if_exists("/boot/kernel/vmhgfs.ko"); diff --git a/config/openbgpd/openbgpd.inc b/config/openbgpd/openbgpd.inc index 038ffa11..102c937d 100644 --- a/config/openbgpd/openbgpd.inc +++ b/config/openbgpd/openbgpd.inc @@ -319,14 +319,6 @@ function openbgpd_put_raw_config($conffile) { } } -function deinstall_openbgpd() { - global $config, $g; - - exec("rm /usr/local/etc/rc.d/bgpd.sh"); - exec("rm /usr/local/www/openbgpd_status.php"); - exec("killall bgpd"); -} - function check_group_usage($groupname) { global $config, $g; diff --git a/config/openbgpd/openbgpd.xml b/config/openbgpd/openbgpd.xml index 83e0122c..07810c0c 100644 --- a/config/openbgpd/openbgpd.xml +++ b/config/openbgpd/openbgpd.xml @@ -182,9 +182,6 @@ </rowhelper> </field> </fields> - <custom_php_deinstall_command> - deinstall_openbgpd(); - </custom_php_deinstall_command> <custom_php_resync_config_command> openbgpd_install_conf(); </custom_php_resync_config_command> diff --git a/config/openbgpd/openbgpd_groups.xml b/config/openbgpd/openbgpd_groups.xml index f43ab466..3ece75f2 100644 --- a/config/openbgpd/openbgpd_groups.xml +++ b/config/openbgpd/openbgpd_groups.xml @@ -105,9 +105,6 @@ <size>80</size> </field> </fields> - <custom_php_deinstall_command> - deinstall_openbgpd(); - </custom_php_deinstall_command> <custom_php_resync_config_command> openbgpd_install_conf(); </custom_php_resync_config_command> diff --git a/config/openvpn-client-export/openvpn-client-export.inc b/config/openvpn-client-export/openvpn-client-export.inc index 963a2604..4dbc7302 100755 --- a/config/openvpn-client-export/openvpn-client-export.inc +++ b/config/openvpn-client-export/openvpn-client-export.inc @@ -62,18 +62,7 @@ function openvpn_client_export_install() { } function openvpn_client_export_deinstall() { - global $current_openvpn_version; - conf_mount_rw(); - $phpfile = "vpn_openvpn_export.php"; - $phpfile2 = "vpn_openvpn_export_shared.php"; - $ovpndir = "/usr/local/share/openvpn"; - $workdir = "{$ovpndir}/client-export"; - - unlink_if_exists("/usr/local/www/{$phpfile}"); - unlink_if_exists("/usr/local/www/{$phpfile2}"); - unlink_if_exists("/usr/local/pkg/openvpn-client-export-{$current_openvpn_version}.tgz"); - exec("/bin/rm -r {$workdir}"); - conf_mount_ro(); + exec("/bin/rm -r /usr/local/share/openvpn/client-export"); } function openvpn_client_export_prefix($srvid, $usrid = null, $crtid = null) { diff --git a/config/phpservice/phpservice.inc b/config/phpservice/phpservice.inc index cffdb09f..d04e021a 100644 --- a/config/phpservice/phpservice.inc +++ b/config/phpservice/phpservice.inc @@ -104,7 +104,6 @@ EOF; } function phpservice_install_command() { - conf_mount_rw(); write_rcfile(array( "file" => "phpservice.sh", "start" => "/usr/local/bin/php /usr/local/pkg/phpservice.php >> /var/log/phpservice.log &", @@ -112,15 +111,6 @@ function phpservice_install_command() { ) ); phpservice_sync_package(); - conf_mount_ro(); -} - - -function phpservice_deinstall_command() { - conf_mount_rw(); - stop_service("phpservice"); - unlink_if_exists("/usr/local/etc/rc.d/phpservice.sh"); - conf_mount_ro(); } ?> diff --git a/config/phpservice/phpservice.xml b/config/phpservice/phpservice.xml index e437be20..6bada596 100644 --- a/config/phpservice/phpservice.xml +++ b/config/phpservice/phpservice.xml @@ -81,7 +81,4 @@ <custom_php_install_command> phpservice_install_command(); </custom_php_install_command> - <custom_php_deinstall_command> - phpservice_deinstall_command(); - </custom_php_deinstall_command> </packagegui> diff --git a/config/routed/routed.inc b/config/routed/routed.inc index 471c2772..3bcef0aa 100644 --- a/config/routed/routed.inc +++ b/config/routed/routed.inc @@ -105,21 +105,17 @@ function setup_etc_gateways($iface="", $mode="") { } function routed_install_command() { - conf_mount_rw(); write_rcfile(array( "file" => "routed.sh", "start" => "/usr/bin/nohup /sbin/routed > /dev/null 2>&1 &", "stop" => "/bin/pkill routed" ) ); - conf_mount_ro(); } function routed_deinstall_command() { stop_service("routed"); - conf_mount_rw(); unlink_if_exists("/usr/local/etc/rc.d/routed.sh"); - conf_mount_ro(); } ?> diff --git a/config/spamd/spamd.inc b/config/spamd/spamd.inc index a7be4587..a72d8770 100644 --- a/config/spamd/spamd.inc +++ b/config/spamd/spamd.inc @@ -284,22 +284,14 @@ function custom_php_install_command() { global $config, $g; system("touch /var/db/whitelist.txt"); system("touch /var/db/blacklist.txt"); - sync_package_spamd(); - conf_mount_rw(); exec("/usr/sbin/pw usermod _spamd -g proxy -G _spamd,proxy"); - exec("/bin/cp /usr/local/etc/spamd/spamd.conf.sample /usr/local/etc/spamd/spamd.conf"); - conf_mount_ro(); + sync_package_spamd(); } function custom_php_deinstall_command() { global $config, $g; - conf_mount_rw(); - exec("killall -9 spamd"); unlink_if_exists("/usr/local/pkg/pf/spamd_rules.php"); - unlink_if_exists("/usr/local/www/spamd_rules.php"); - unlink_if_exists("/usr/local/etc/rc.d/spamd.sh"); spamd_install_cron(false); - conf_mount_ro(); filter_configure(); } diff --git a/config/sshdcond/sshdcond.inc b/config/sshdcond/sshdcond.inc index 12af3551..c7c19291 100644 --- a/config/sshdcond/sshdcond.inc +++ b/config/sshdcond/sshdcond.inc @@ -39,29 +39,23 @@ function restart_sshd() { function sshdcond_custom_php_install_command() { global $g, $config; - conf_mount_rw(); - /* We need to generate an outfile for our extra commands. The patched g_szSSHDFileGenerate php file then reads and appends that config. */ $fd = fopen("/etc/ssh/sshd_extra", 'w'); fclose($fd); - conf_mount_ro(); } function sshdcond_custom_php_deinstall_command() { global $g, $config; - conf_mount_rw(); - /* Delete our config file. */ unlink_if_exists("/etc/ssh/sshd_extra"); /* Re-run sshd config generation script. */ restart_sshd(); - conf_mount_ro(); } function sshdcond_custom_php_write_config() { diff --git a/config/stunnel/stunnel.inc b/config/stunnel/stunnel.inc index 4398a0dc..7f3f9338 100644 --- a/config/stunnel/stunnel.inc +++ b/config/stunnel/stunnel.inc @@ -218,7 +218,6 @@ function stunnel_install() { write_rcfile($_rcfile); unlink_if_exists("/usr/local/etc/rc.d/stunnel"); - conf_mount_rw(); $fout = fopen(STUNNEL_ETCDIR . "/stunnel.conf","w"); fwrite($fout, "cert = " . STUNNEL_ETCDIR . "/stunnel.pem \n"); fwrite($fout, "chroot = /var/tmp/stunnel \n"); @@ -234,7 +233,6 @@ function stunnel_install() { } } fclose($fout); - conf_mount_ro(); } function stunnel_deinstall() { diff --git a/config/syslog-ng/syslog-ng.inc b/config/syslog-ng/syslog-ng.inc index f0c17ff1..57a94f96 100644 --- a/config/syslog-ng/syslog-ng.inc +++ b/config/syslog-ng/syslog-ng.inc @@ -52,7 +52,6 @@ function syslogng_get_real_interface_address($interface) { } function syslogng_install_command() { - conf_mount_rw(); if (is_link("/usr/local/lib/syslog-ng")) { unlink("/usr/local/lib/syslog-ng"); } @@ -60,20 +59,15 @@ function syslogng_install_command() { @symlink(SYSLOGNG_BASEDIR . "local/lib/syslog-ng", "/usr/local/lib/syslog-ng"); } syslogng_install_cron(true); - conf_mount_ro(); syslogng_resync(); } function syslogng_deinstall_command() { - conf_mount_rw(); - service_stop("syslog-ng"); - unlink_if_exists("/usr/local/etc/rc.d/syslog-ng.sh"); if (is_link("/usr/local/lib/syslog-ng")) unlink("/usr/local/lib/syslog-ng"); syslogng_install_cron(false); unlink_if_exists("/usr/local/etc/logrotate.conf"); unlink_if_exists("/usr/local/etc/syslog-ng.conf"); - conf_mount_ro(); filter_configure(); } diff --git a/config/tftp2/tftp.inc b/config/tftp2/tftp.inc index a2b7d1e3..67054619 100644 --- a/config/tftp2/tftp.inc +++ b/config/tftp2/tftp.inc @@ -45,7 +45,6 @@ function tftp_install_command() { $tftpbackup = "/root/backup/tftp.bak.tgz"; // Create the directories if required - conf_mount_rw(); safe_mkdir("{$tftpdir}", 0777); safe_mkdir("/root/backup/"); @@ -55,14 +54,11 @@ function tftp_install_command() { system("/bin/chmod -R 0744 {$tftpdir}/*"); unset($tftpbackup); } - conf_mount_ro(); } function tftp_deinstall_command() { - conf_mount_rw(); unlink_if_exists("/usr/local/etc/rc.d/tftp.sh"); unlink_if_exists("/tmp/pkg_mgr_tftp.log"); - conf_mount_ro(); } function tftp_generate_rules($type) { diff --git a/config/vhosts/vhosts.inc b/config/vhosts/vhosts.inc index cf2f97b8..7ac027b9 100644 --- a/config/vhosts/vhosts.inc +++ b/config/vhosts/vhosts.inc @@ -622,7 +622,6 @@ EOF; function vhosts_install_command() { global $config; - conf_mount_rw(); safe_mkdir("/usr/local/vhosts/"); write_rcfile(array( @@ -637,13 +636,9 @@ function vhosts_install_command() { function vhosts_deinstall_command() { - conf_mount_rw(); - stop_service("vhosts-http"); - unlink_if_exists("/usr/local/etc/rc.d/vhosts-http.sh"); exec("/bin/rm -f /usr/local/etc/rc.d/vhosts*"); exec("/bin/rm -f /var/etc/vhosts*"); exec("/bin/rm -rf /usr/local/www/packages/vhosts"); - conf_mount_ro(); } ?> diff --git a/config/vnstat2/vnstat2.inc b/config/vnstat2/vnstat2.inc index 89a8b7c2..86a95346 100644 --- a/config/vnstat2/vnstat2.inc +++ b/config/vnstat2/vnstat2.inc @@ -30,7 +30,6 @@ require_once("util.inc"); function vnstat_install_deinstall() { - conf_mount_rw(); global $config; // Remove Vnstat package and files exec("/bin/rm -d -R /usr/local/www/vnstat2"); @@ -39,7 +38,6 @@ function vnstat_install_deinstall() { exec("/bin/rm /usr/local/etc/vnstat.conf"); // Remove vnstat cron entry from config.xml vnstat2_install_cron(false); - conf_mount_ro(); } function vnstat2_install_cron($vnstat_cron_value) { diff --git a/config/zabbix-agent-lts/zabbix-agent-lts.inc b/config/zabbix-agent-lts/zabbix-agent-lts.inc index 7eb7c564..ddf04f6f 100644 --- a/config/zabbix-agent-lts/zabbix-agent-lts.inc +++ b/config/zabbix-agent-lts/zabbix-agent-lts.inc @@ -41,10 +41,6 @@ if ($pf_version == "2.1" || $pf_version == "2.2") { } function php_deinstall_zabbix_agent_lts() { - conf_mount_rw(); - - stop_service("zabbix_agentd_lts"); - unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/rc.d/zabbix_agentd_lts.sh"); unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/zabbix22/zabbix_agentd.conf"); unlink_if_exists("/var/log/zabbix-agent-lts/zabbix_agentd_lts.log"); unlink_if_exists("/var/run/zabbix-agent-lts/zabbix_agentd_lts.pid"); @@ -55,8 +51,6 @@ function php_deinstall_zabbix_agent_lts() { if (is_dir("/var/run/zabbix-agent-lts")) { mwexec("/bin/rm -rf /var/run/zabbix-agent-lts/"); } - - conf_mount_ro(); } function validate_input_zabbix_agent_lts($post, &$input_errors) { diff --git a/config/zabbix-proxy-lts/zabbix-proxy-lts.inc b/config/zabbix-proxy-lts/zabbix-proxy-lts.inc index f1b877b5..39ef4f2b 100644 --- a/config/zabbix-proxy-lts/zabbix-proxy-lts.inc +++ b/config/zabbix-proxy-lts/zabbix-proxy-lts.inc @@ -41,10 +41,6 @@ if ($pf_version == "2.1" || $pf_version == "2.2") { } function php_deinstall_zabbix_proxy_lts() { - conf_mount_rw(); - - stop_service("zabbix_proxy_lts"); - unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/rc.d/zabbix_proxy_lts.sh"); unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/zabbix22/zabbix_proxy_lts.conf"); unlink_if_exists("/var/log/zabbix-proxy-lts/zabbix_proxy_lts.log"); unlink_if_exists("/var/run/zabbix-proxy-lts/zabbix_proxy_lts.pid"); @@ -58,8 +54,6 @@ function php_deinstall_zabbix_proxy_lts() { if (is_dir("/var/db/zabbix-proxy-lts")) { mwexec("/bin/rm -rf /var/db/zabbix-proxy-lts/"); } - - conf_mount_ro(); } function validate_input_zabbix_proxy_lts($post, &$input_errors) { diff --git a/pkg_config.10.xml b/pkg_config.10.xml index abd6a714..d0ea37e1 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -39,7 +39,7 @@ </descr> <website>http://www.asterisk.org/</website> <category>Services</category> - <version>0.3.2</version> + <version>0.3.3</version> <status>Beta</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/asterisk/asterisk.xml</config_file> @@ -171,7 +171,7 @@ </descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> - <version>0.28</version> + <version>0.29</version> <status>Release</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file> @@ -261,7 +261,7 @@ <ports_after>net/avahi-app devel/dbus</ports_after> </build_pbi> <depends_on_package_pbi>avahi-0.6.31-##ARCH##.pbi</depends_on_package_pbi> - <version>1.10.0</version> + <version>1.10.1</version> <status>BETA</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/avahi/avahi.xml</config_file> @@ -279,7 +279,7 @@ <port>net/ntop</port> </build_pbi> <build_options>ntop_SET_FORCE=PCAP_PORT XMLDUMP MAKO;ntop_UNSET_FORCE=JUMBO_FRAMES;rrdtool_UNSET_FORCE=DEJAVU PERL_MODULE PYTHON_MODULE RUBY_MODULE;rrdtool_SET_FORCE=JSON MMAP NLS;graphviz_UNSET_FORCE=XPM DIGCOLA IPSEPCOLA PANGOCAIRO;graphviz_SET_FORCE=ICONV NLS;cairo_UNSET_FORCE=X11 XCB;libgd_UNSET_FORCE=FONTCONFIG XPM;libgd_SET_FORCE=ICONV;libpcap_UNSET_FORCE=DAG;libpcap_SET_FORCE=IPV6</build_options> - <version>5.0.1_4 v2.3</version> + <version>2.3.1</version> <status>BETA</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/ntop2/ntop.xml</config_file> @@ -312,7 +312,7 @@ <category>Status</category> <pkginfolink/> <config_file>https://packages.pfsense.org/packages/config/notes/notes.xml</config_file> - <version>0.2.6</version> + <version>0.2.7</version> <status>Alpha</status> <required_version>2.2</required_version> <maintainer>markjcrane@gmail.com</maintainer> @@ -325,7 +325,7 @@ <pkginfolink/> <port_category>ftp</port_category> <config_file>https://packages.pfsense.org/packages/config/tftp2/tftp.xml</config_file> - <version>2.2</version> + <version>2.2.1</version> <status>Stable</status> <required_version>2.2</required_version> <configurationfile>tftp.xml</configurationfile> @@ -337,7 +337,7 @@ <category>Services</category> <pkginfolink>https://doc.pfsense.org/index.php/PHPService</pkginfolink> <config_file>https://packages.pfsense.org/packages/config/phpservice/phpservice.xml</config_file> - <version>0.5.0</version> + <version>0.5.1</version> <status>Beta</status> <required_version>2.2</required_version> <maintainer>markjcrane@gmail.com</maintainer> @@ -349,7 +349,7 @@ <descr>Tool to Backup and Restore files and directories.</descr> <category>System</category> <config_file>https://packages.pfsense.org/packages/config/backup/backup.xml</config_file> - <version>0.1.9</version> + <version>0.2.0</version> <status>Beta</status> <required_version>2.2</required_version> <maintainer>markjcrane@gmail.com</maintainer> @@ -360,7 +360,7 @@ <descr>The cron utility is used to manage commands on a schedule.</descr> <category>Services</category> <config_file>https://packages.pfsense.org/packages/config/cron/cron.xml</config_file> - <version>0.3.0</version> + <version>0.3.1</version> <status>Beta</status> <required_version>2.2</required_version> <maintainer>markjcrane@gmail.com</maintainer> @@ -373,7 +373,7 @@ <port_category>www</port_category> <pkginfolink>https://doc.pfsense.org/index.php/vhosts</pkginfolink> <config_file>https://packages.pfsense.org/packages/config/vhosts/vhosts.xml</config_file> - <version>0.8.0</version> + <version>0.8.1</version> <status>ALPHA</status> <required_version>2.2</required_version> <maintainer>markjcrane@gmail.com</maintainer> @@ -426,7 +426,7 @@ <category>Network Management</category> <port_category>net</port_category> <config_file>https://packages.pfsense.org/packages/config/routed/routed.xml</config_file> - <version>1.2</version> + <version>1.2.1</version> <status>Stable</status> <required_version>2.2</required_version> <configurationfile>routed.xml</configurationfile> @@ -438,7 +438,7 @@ <category>Services</category> <config_file>https://packages.pfsense.org/packages/config/spamd/spamd.xml</config_file> <depends_on_package_pbi>spamd-4.9.1_2-##ARCH##.pbi</depends_on_package_pbi> - <version>1.1.3</version> + <version>1.1.4</version> <status>Beta</status> <required_version>2.2</required_version> <port_category>mail</port_category> @@ -566,7 +566,7 @@ <build_pbi> <port>net/openbgpd</port> </build_pbi> - <version>0.9.3.4</version> + <version>0.9.3.5</version> <status>STABLE</status> <pkginfolink>https://doc.pfsense.org/index.php/OpenBGPD_package</pkginfolink> <required_version>2.2</required_version> @@ -688,7 +688,7 @@ <build_pbi> <port>net/vnstat</port> </build_pbi> - <version>1.12.5</version> + <version>1.12.6</version> <status>Stable</status> <required_version>2.2</required_version> <maintainer>crazypark2@yahoo.dk</maintainer> @@ -722,7 +722,7 @@ <descr>VMware Tools is a suite of utilities that enhances the performance of the virtual machine's guest operating system and improves management of the virtual machine.</descr> <website>http://open-vm-tools.sourceforge.net/</website> <category>Services</category> - <version>1280544.11</version> + <version>1280544.12</version> <status>Stable</status> <pkginfolink>https://doc.pfsense.org/index.php/Open_VM_Tools_package</pkginfolink> <required_version>2.2</required_version> @@ -814,7 +814,7 @@ <descr>Network UPS Tools.</descr> <website>http://www.networkupstools.org/</website> <category>Network Management</category> - <version>2.0.8</version> + <version>2.0.9</version> <status>BETA</status> <required_version>2.2</required_version> <maintainer>rswagoner@gmail.com</maintainer> @@ -907,7 +907,7 @@ </descr> <pkginfolink>https://doc.pfsense.org/index.php/FreeRADIUS_2.x_package</pkginfolink> <category>System</category> - <version>1.6.14</version> + <version>1.6.15</version> <status>RC1</status> <required_version>2.2</required_version> <maintainer>nachtfalkeaw@web.de</maintainer> @@ -929,7 +929,7 @@ <website>http://bandwidthd.sourceforge.net/</website> <descr>BandwidthD tracks usage of TCP/IP network subnets and builds html files with graphs to display utilization. Charts are built by individual IPs, and by default display utilization over 2 day, 8 day, 40 day, and 400 day periods. Furthermore, each ip address's utilization can be logged out at intervals of 3.3 minutes, 10 minutes, 1 hour or 12 hours in cdf format, or to a backend database server. HTTP, TCP, UDP, ICMP, VPN, and P2P traffic are color coded.</descr> <category>System</category> - <version>0.6</version> + <version>0.6.1</version> <status>BETA</status> <required_version>2.2</required_version> <depends_on_package_pbi>bandwidthd-2.0.1_6-##ARCH##.pbi</depends_on_package_pbi> @@ -951,7 +951,7 @@ <descr>SSL encryption wrapper between remote client and local or remote servers.</descr> <category>Network Management</category> <depends_on_package_pbi>stunnel-5.20-##ARCH##.pbi</depends_on_package_pbi> - <version>5.20</version> + <version>5.20.1</version> <status>Stable</status> <pkginfolink>https://doc.pfsense.org/index.php/Stunnel_package</pkginfolink> <required_version>2.2</required_version> @@ -1184,7 +1184,7 @@ <build_port_path>/usr/ports/archivers/zip</build_port_path> <port_category>security</port_category> <run_depends>share/openvpn/client-export/template/config-import:security/openvpn-client-export bin/zip:archivers/zip bin/7z:archivers/p7zip</run_depends> - <version>1.2.19</version> + <version>1.2.20</version> <status>RELEASE</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/openvpn-client-export/openvpn-client-export.xml</config_file> @@ -1299,7 +1299,7 @@ </build_pbi> <build_options>nrpe_SET_FORCE=SSL;nrpe_UNSET_FORCE=ARGS</build_options> <config_file>https://packages.pfsense.org/packages/config/nrpe2/nrpe2.xml</config_file> - <version>2.15_5 v2.2_4</version> + <version>2.2.5</version> <status>Beta</status> <required_version>2.2.1</required_version> <maintainer>erik@erikkristensen.com</maintainer> @@ -1336,7 +1336,7 @@ ]]> </descr> <category>Enhancements</category> - <version>1.0.3</version> + <version>1.0.4</version> <status>Beta</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/sshdcond/sshdcond.xml</config_file> @@ -1397,7 +1397,7 @@ <descr>Bacula is a set of Open Source computer programs that permit managings backups, recovery, and verification of computer data across a network of computers of different kinds.</descr> <website>http://www.bacula.org/</website> <category>Services</category> - <version>1.0.8</version> + <version>1.0.9</version> <status>Stable</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/bacula-client/bacula-client.xml</config_file> @@ -1495,7 +1495,7 @@ <website>http://www.balabit.com/network-security/syslog-ng/</website> <descr>Syslog-ng syslog server. This service is not intended to replace the default pfSense syslog server but rather acts as an independent syslog server.</descr> <category>Services</category> - <version>1.0.8</version> + <version>1.0.9</version> <status>ALPHA</status> <required_version>2.2</required_version> <depends_on_package_pbi>syslog-ng-3.6.2_3-##ARCH##.pbi</depends_on_package_pbi> @@ -1523,7 +1523,7 @@ <website>http://www.zabbix.com/product.php</website> <category>Services</category> <config_file>https://packages.pfsense.org/packages/config/zabbix-agent-lts/zabbix-agent-lts.xml</config_file> - <version>0.8.6</version> + <version>0.8.7</version> <status>BETA</status> <required_version>2.2</required_version> <configurationfile>zabbix-agent-lts.xml</configurationfile> @@ -1550,7 +1550,7 @@ <website>http://www.zabbix.com/product.php</website> <category>Services</category> <config_file>https://packages.pfsense.org/packages/config/zabbix-proxy-lts/zabbix-proxy-lts.xml</config_file> - <version>0.8.6</version> + <version>0.8.7</version> <status>BETA</status> <required_version>2.2</required_version> <configurationfile>zabbix-proxy-lts.xml</configurationfile> @@ -1669,7 +1669,7 @@ <website>http://www.apcupsd.com/</website> <category>Services</category> <config_file>https://packages.pfsense.org/packages/config/apcupsd/apcupsd.xml</config_file> - <version>0.3.7</version> + <version>0.3.8</version> <status>BETA</status> <required_version>2.2</required_version> <configurationfile>apcupsd.xml</configurationfile> |