From 697c4e5735faa3aa1091dffb7044827027d4d35d Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 08:25:06 +0200 Subject: remove useless remount calls on package_deinstall These are dealt with by uninstall_package() from pkg-utils.inc. Also the service is stopped by it. --- config/apcupsd/apcupsd.inc | 3 --- 1 file changed, 3 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) { -- cgit v1.2.3 From 29b08526786a9a30217d934605bf1930028d9b65 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 08:32:12 +0200 Subject: Remove useless asterisk_deinstall() function These are dealt with by delete_package_xml() from pkg-utils.inc. --- config/asterisk/asterisk.inc | 5 ----- 1 file changed, 5 deletions(-) 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(); -- cgit v1.2.3 From ea5a2a7170f2c18372eb2d3b98a87822a24c0acd Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 08:33:23 +0200 Subject: Remove useless custom_php_deinstall_command These are dealt with by delete_package_xml() from pkg-utils.inc. --- config/asterisk/asterisk.xml | 3 --- 1 file changed, 3 deletions(-) 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 @@ asterisk_install(); - - asterisk_deinstall(); - sync_package_asterisk(); -- cgit v1.2.3 From 4e25dce24f823641e44938d0ab0ddb6ed5a1afb5 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 08:46:22 +0200 Subject: Remove useless remount calls and other redundant stuff These are dealt with by install_package(), uninstall_package() and delete_package_xml() from pkg-utils.inc. --- config/avahi/avahi.inc | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) 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() { -- cgit v1.2.3 From 351a25537406b9d005b4e4e7cc0fb02535314f8d Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 08:47:55 +0200 Subject: remove useless remount calls on package_install These are dealt with by install_package() from pkg-utils.inc. --- config/backup/backup.inc | 2 -- 1 file changed, 2 deletions(-) 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(); } ?> -- cgit v1.2.3 From e6652b377ea0d0cd5a841ea256e2b73c06e27201 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 08:50:46 +0200 Subject: Remove useless remount calls and other redundant stuff These are dealt with by uninstall_package() and delete_package_xml() from pkg-utils.inc. --- config/bacula-client/bacula-client.inc | 7 ------- 1 file changed, 7 deletions(-) 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(){ -- cgit v1.2.3 From 25f27d1ef04f35d2fdafb57aa5acfea627890e65 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 08:53:30 +0200 Subject: Remove useless remount calls and other redundant stuff These are dealt with by uninstall_package() and delete_package_xml() from pkg-utils.inc. --- config/bandwidthd/bandwidthd.inc | 3 --- 1 file changed, 3 deletions(-) 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() { -- cgit v1.2.3 From 74c7b167db4bf3e7990b9116d9e658994ff8836f Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 08:57:19 +0200 Subject: remove useless remount call These are dealt with by install_package() from pkg-utils.inc. --- config/cron/cron.inc | 1 - 1 file changed, 1 deletion(-) 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(); -- cgit v1.2.3 From 8923190902c9086c8ebcd56b0a9c136371eb1b44 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 09:01:05 +0200 Subject: Remove useless remount calls These are dealt with by install_package() from pkg-utils.inc. --- config/freeradius2/freeradius.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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"); } -- cgit v1.2.3 From 4537c6efdf7e68e8ddb46ef8d4c5f9a472aff122 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 09:05:15 +0200 Subject: Remove useless remount calls These are dealt with by install_package() from pkg-utils.inc. --- config/haproxy-legacy/haproxy.inc | 2 -- 1 file changed, 2 deletions(-) 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 = << Date: Tue, 25 Aug 2015 09:06:24 +0200 Subject: Remove useless remount calls These are dealt with by install_package() from pkg-utils.inc. --- config/haproxy-legacy/haproxy.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 @@ - \ No newline at end of file + -- cgit v1.2.3 From 62ba5b50249be65617f80f138778aa7fcda73a93 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 09:12:02 +0200 Subject: Remove useless remount calls These are dealt with by install_package() from pkg-utils.inc. --- config/haproxy-devel/pkg/haproxy.inc | 8 -------- 1 file changed, 8 deletions(-) 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); -- cgit v1.2.3 From 5157df459debfddcb0d8a17eaf0a07a6651247ea Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 09:13:56 +0200 Subject: Remove useless remount calls and other redundant stuff These are dealt with by install_package() from pkg-utils.inc. Also nuke unused tags. --- config/haproxy/haproxy.xml | 9 --------- 1 file changed, 9 deletions(-) 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 @@ 077 https://packages.pfsense.org/packages/config/haproxy/haproxy_pool_edit.php - - - - - - /* 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 @@ haproxy_custom_php_deinstall_command(); - - -- cgit v1.2.3 From c37cd891c3149cb0a0acd4b16f3f998e1916a707 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 09:15:00 +0200 Subject: Remove useless remount calls These are dealt with by install_package() from pkg-utils.inc. --- config/haproxy/haproxy.inc | 3 --- 1 file changed, 3 deletions(-) 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 = << Date: Tue, 25 Aug 2015 09:16:16 +0200 Subject: Remove useless remount calls These are dealt with by install_package() from pkg-utils.inc. --- config/haproxy1_5/pkg/haproxy.inc | 8 -------- 1 file changed, 8 deletions(-) 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); -- cgit v1.2.3 From 11b621409408b96cbf6415a7af4a42ca5512b996 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 09:23:16 +0200 Subject: Remove useles file These are dealt with by uninstall_package() from pkg-utils.inc and there are no other functions here --- config/notes/notes.inc | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 config/notes/notes.inc 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 @@ - -- cgit v1.2.3 From 5c616736ed1a94e9ae4a65da3f433aeee000d810 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 09:23:43 +0200 Subject: Remove useless custom_php_deinstall_command These are dealt with by uninstall_package() from pkg-utils.inc. --- config/notes/notes.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/notes/notes.xml b/config/notes/notes.xml index e74a76f1..7d94593f 100644 --- a/config/notes/notes.xml +++ b/config/notes/notes.xml @@ -103,7 +103,4 @@ 20 - - notes_deinstall_command(); - -- cgit v1.2.3 From c021a2b3081aa369acd8c4d4228d49145ef9a3af Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 09:26:23 +0200 Subject: Remove useless remount calls These are dealt with by install_package() from pkg-utils.inc. Also, the nrpe2_custom_php_deinstall_command() function was completely useless, doing nothing else but remounts. --- config/nrpe2/nrpe2.inc | 9 --------- 1 file changed, 9 deletions(-) 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() { -- cgit v1.2.3 From 51f274fd37591c36586f649ef753abacbaa90c1e Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 09:27:19 +0200 Subject: Remove useless nrpe2_custom_php_deinstall_command() --- config/nrpe2/nrpe2.xml | 1 - 1 file changed, 1 deletion(-) 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(); - nrpe2_custom_php_deinstall_command(); nrpe2_custom_php_write_config(); -- cgit v1.2.3 From 8c19118f5fa70d2c5d1dad839c7aa0acd7a380b9 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 09:28:45 +0200 Subject: Remove useless custom_php_deinstall_command These are dealt with by delete_package_xml() from pkg-utils.inc. --- config/ntop2/ntop.xml | 3 --- 1 file changed, 3 deletions(-) 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 @@ sync_package_ntop(); - - exec("rm /usr/local/etc/rc.d/ntop*"); - Date: Tue, 25 Aug 2015 09:30:57 +0200 Subject: Remove useless stuff dealt with by delete_package_xml() --- config/nut/nut.inc | 3 --- 1 file changed, 3 deletions(-) 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'); -- cgit v1.2.3 From 0b4a16237dab7e69b464156044903b4141432b38 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 09:34:01 +0200 Subject: Remove useless remount calls and other redundant stuff These are dealt with by uninstall_package() and delete_package_xml() from pkg-utils.inc. --- config/open-vm-tools_2/open-vm-tools.inc | 6 ------ 1 file changed, 6 deletions(-) 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"); -- cgit v1.2.3 From d85c108f6dc734e5382682a531fabbf90412f00d Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 09:36:59 +0200 Subject: Remove useless deinstall_openbgpd() function All of these are dealt with by uninstall_package() and delete_package_xml() from pkg-utils.inc. --- config/openbgpd/openbgpd.inc | 8 -------- 1 file changed, 8 deletions(-) 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; -- cgit v1.2.3 From d1a026b5e36ec9220bb20ace0c1008e02e051a0c Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 09:37:45 +0200 Subject: Remove useless deinstall_openbgpd() function --- config/openbgpd/openbgpd.xml | 3 --- 1 file changed, 3 deletions(-) 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 @@ - - deinstall_openbgpd(); - openbgpd_install_conf(); -- cgit v1.2.3 From dfaecb560997b2a078182cb65fb03e69bf5d35cf Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 09:38:13 +0200 Subject: Remove useless deinstall_openbgpd() function --- config/openbgpd/openbgpd_groups.xml | 3 --- 1 file changed, 3 deletions(-) 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 @@ 80 - - deinstall_openbgpd(); - openbgpd_install_conf(); -- cgit v1.2.3 From 839d97cc8f7ff1ac86bc1b951db2c106fadf6535 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 09:45:35 +0200 Subject: Remove useless remount calls and other redundant stuff All of these are dealt with by uninstall_package() and delete_package_xml() from pkg-utils.inc. --- config/openvpn-client-export/openvpn-client-export.inc | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/config/openvpn-client-export/openvpn-client-export.inc b/config/openvpn-client-export/openvpn-client-export.inc index 963a2604..1d8512ae 100755 --- a/config/openvpn-client-export/openvpn-client-export.inc +++ b/config/openvpn-client-export/openvpn-client-export.inc @@ -62,18 +62,8 @@ 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(); } function openvpn_client_export_prefix($srvid, $usrid = null, $crtid = null) { -- cgit v1.2.3 From a12de5b5a71549a7c978b9f1f11ca354a631884b Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 09:48:10 +0200 Subject: Remove useless remount calls and phpservice_deinstall_command() All of these are dealt with by uninstall_package() and from pkg-utils.inc. --- config/phpservice/phpservice.inc | 10 ---------- 1 file changed, 10 deletions(-) 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(); } ?> -- cgit v1.2.3 From ec436c0e0784326ad56e69cdd599693e0932e985 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 09:49:08 +0200 Subject: Remove useless phpservice_deinstall_command() All of these are dealt with by uninstall_package() and delete_package_xml() from pkg-utils.inc. --- config/phpservice/phpservice.xml | 3 --- 1 file changed, 3 deletions(-) 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 @@ phpservice_install_command(); - - phpservice_deinstall_command(); - -- cgit v1.2.3 From bde0ce318eafa8de5e4f146bb104af78527c639e Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 09:51:03 +0200 Subject: Remove useless remount calls These are dealt with by install_package() and uninstall_package() from pkg-utils.inc. --- config/routed/routed.inc | 4 ---- 1 file changed, 4 deletions(-) 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(); } ?> -- cgit v1.2.3 From bdeb5bae62a6f3716e3ed7b099f0cca66d9d3ee9 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 09:55:51 +0200 Subject: Remove useless remount calls and other redundant stuff All of these are dealt with by install_package(), uninstall_package() and delete_package_xml() from pkg-utils.inc. --- config/spamd/spamd.inc | 7 ------- 1 file changed, 7 deletions(-) diff --git a/config/spamd/spamd.inc b/config/spamd/spamd.inc index a7be4587..bceafd09 100644 --- a/config/spamd/spamd.inc +++ b/config/spamd/spamd.inc @@ -285,21 +285,14 @@ function custom_php_install_command() { 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(); } 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(); } -- cgit v1.2.3 From 0debbeb95915bfb4972c016777e6198e1ef000ee Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 09:57:36 +0200 Subject: Remove useless remount calls These are dealt with by install_package() and uninstall_package() from pkg-utils.inc. --- config/sshdcond/sshdcond.inc | 6 ------ 1 file changed, 6 deletions(-) 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() { -- cgit v1.2.3 From 125b62c3a894c398071155b678d100ccb4d5c210 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 10:00:59 +0200 Subject: Remove useless remount calls These are dealt with by install_package() from pkg-utils.inc. --- config/stunnel/stunnel.inc | 2 -- 1 file changed, 2 deletions(-) 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() { -- cgit v1.2.3 From 836c44690134dd104de50f2eab0f042a964af5a6 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 10:03:22 +0200 Subject: Remove useless remount calls and other redundant stuff All of these are dealt with by install_package(), uninstall_package() and delete_package_xml() from pkg-utils.inc. --- config/syslog-ng/syslog-ng.inc | 6 ------ 1 file changed, 6 deletions(-) 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(); } -- cgit v1.2.3 From 1655f88deee13024c160c371d9ca79de273ad98c Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 10:06:33 +0200 Subject: Remove useless remount calls These are dealt with by install_package() and uninstall_package() from pkg-utils.inc. --- config/tftp2/tftp.inc | 4 ---- 1 file changed, 4 deletions(-) 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) { -- cgit v1.2.3 From 04abb9bc8b3a4f8cbd01e70877ebdde4fb60aa10 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 10:10:01 +0200 Subject: Remove useless remount calls and other redundant stuff These are dealt with by install_package(), uninstall_package() and delete_package_xml() from pkg-utils.inc. --- config/vhosts/vhosts.inc | 5 ----- 1 file changed, 5 deletions(-) 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(); } ?> -- cgit v1.2.3 From 53f108ceaf6baf31341ba1b9fba69ccfd9dee9e7 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 10:11:35 +0200 Subject: Remove useless remount calls These are dealt with by uninstall_package() from pkg-utils.inc. --- config/vnstat2/vnstat2.inc | 2 -- 1 file changed, 2 deletions(-) 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) { -- cgit v1.2.3 From c1952a8ff6f1410dae9e5453c8d20c5d903a1d77 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 10:13:47 +0200 Subject: Remove useless remount calls and other redundant stuff These are dealt with by uninstall_package() and delete_package_xml() from pkg-utils.inc. --- config/zabbix-agent-lts/zabbix-agent-lts.inc | 6 ------ 1 file changed, 6 deletions(-) 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) { -- cgit v1.2.3 From 99a1ced0ff2b26eaa551d80c11addda3b391c3a9 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 10:15:07 +0200 Subject: Remove useless remount calls and other redundant stuff These are dealt with by uninstall_package() and delete_package_xml() from pkg-utils.inc. --- config/zabbix-proxy-lts/zabbix-proxy-lts.inc | 6 ------ 1 file changed, 6 deletions(-) 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) { -- cgit v1.2.3 From 39f8e2e285759a6afc2a30a936095c590572d20f Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 10:32:36 +0200 Subject: Bump lot of package versions for useless remount calls removal --- pkg_config.10.xml | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 71c27fd1..46c2a65d 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -39,7 +39,7 @@ http://www.asterisk.org/ Services - 0.3.2 + 0.3.3 Beta 2.2 https://packages.pfsense.org/packages/config/asterisk/asterisk.xml @@ -171,7 +171,7 @@ http://haproxy.1wt.eu/ Services - 0.28 + 0.29 Release 2.2 https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml @@ -261,7 +261,7 @@ net/avahi-app devel/dbus avahi-0.6.31-##ARCH##.pbi - 1.10.0 + 1.10.1 BETA 2.2 https://packages.pfsense.org/packages/config/avahi/avahi.xml @@ -279,7 +279,7 @@ net/ntop 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 - 5.0.1_4 v2.3 + 2.3.1 BETA 2.2 https://packages.pfsense.org/packages/config/ntop2/ntop.xml @@ -312,7 +312,7 @@ Status https://packages.pfsense.org/packages/config/notes/notes.xml - 0.2.6 + 0.2.7 Alpha 2.2 markjcrane@gmail.com @@ -325,7 +325,7 @@ ftp https://packages.pfsense.org/packages/config/tftp2/tftp.xml - 2.2 + 2.2.1 Stable 2.2 tftp.xml @@ -337,7 +337,7 @@ Services https://doc.pfsense.org/index.php/PHPService https://packages.pfsense.org/packages/config/phpservice/phpservice.xml - 0.5.0 + 0.5.1 Beta 2.2 markjcrane@gmail.com @@ -349,7 +349,7 @@ Tool to Backup and Restore files and directories. System https://packages.pfsense.org/packages/config/backup/backup.xml - 0.1.9 + 0.2.0 Beta 2.2 markjcrane@gmail.com @@ -360,7 +360,7 @@ The cron utility is used to manage commands on a schedule. Services https://packages.pfsense.org/packages/config/cron/cron.xml - 0.3.0 + 0.3.1 Beta 2.2 markjcrane@gmail.com @@ -373,7 +373,7 @@ www https://doc.pfsense.org/index.php/vhosts https://packages.pfsense.org/packages/config/vhosts/vhosts.xml - 0.8.0 + 0.8.1 ALPHA 2.2 markjcrane@gmail.com @@ -426,7 +426,7 @@ Network Management net https://packages.pfsense.org/packages/config/routed/routed.xml - 1.2 + 1.2.1 Stable 2.2 routed.xml @@ -438,7 +438,7 @@ Services https://packages.pfsense.org/packages/config/spamd/spamd.xml spamd-4.9.1_2-##ARCH##.pbi - 1.1.3 + 1.1.4 Beta 2.2 mail @@ -566,7 +566,7 @@ net/openbgpd - 0.9.3.4 + 0.9.3.5 STABLE https://doc.pfsense.org/index.php/OpenBGPD_package 2.2 @@ -688,7 +688,7 @@ net/vnstat - 1.12.5 + 1.12.6 Stable 2.2 crazypark2@yahoo.dk @@ -722,7 +722,7 @@ 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. http://open-vm-tools.sourceforge.net/ Services - 1280544.11 + 1280544.12 Stable https://doc.pfsense.org/index.php/Open_VM_Tools_package 2.2 @@ -814,7 +814,7 @@ Network UPS Tools. http://www.networkupstools.org/ Network Management - 2.0.8 + 2.0.9 BETA 2.2 rswagoner@gmail.com @@ -907,7 +907,7 @@ https://doc.pfsense.org/index.php/FreeRADIUS_2.x_package System - 1.6.14 + 1.6.15 RC1 2.2 nachtfalkeaw@web.de @@ -929,7 +929,7 @@ http://bandwidthd.sourceforge.net/ 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. System - 0.6 + 0.6.1 BETA 2.2 bandwidthd-2.0.1_6-##ARCH##.pbi @@ -951,7 +951,7 @@ SSL encryption wrapper between remote client and local or remote servers. Network Management stunnel-5.20-##ARCH##.pbi - 5.20 + 5.20.1 Stable https://doc.pfsense.org/index.php/Stunnel_package 2.2 @@ -1184,7 +1184,7 @@ /usr/ports/archivers/zip security share/openvpn/client-export/template/config-import:security/openvpn-client-export bin/zip:archivers/zip bin/7z:archivers/p7zip - 1.2.19 + 1.2.20 RELEASE 2.2 https://packages.pfsense.org/packages/config/openvpn-client-export/openvpn-client-export.xml @@ -1299,7 +1299,7 @@ nrpe_SET_FORCE=SSL;nrpe_UNSET_FORCE=ARGS https://packages.pfsense.org/packages/config/nrpe2/nrpe2.xml - 2.15_5 v2.2_4 + 2.2.5 Beta 2.2.1 erik@erikkristensen.com @@ -1336,7 +1336,7 @@ ]]> Enhancements - 1.0.3 + 1.0.4 Beta 2.2 https://packages.pfsense.org/packages/config/sshdcond/sshdcond.xml @@ -1397,7 +1397,7 @@ 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. http://www.bacula.org/ Services - 1.0.8 + 1.0.9 Stable 2.2 https://packages.pfsense.org/packages/config/bacula-client/bacula-client.xml @@ -1495,7 +1495,7 @@ http://www.balabit.com/network-security/syslog-ng/ Syslog-ng syslog server. This service is not intended to replace the default pfSense syslog server but rather acts as an independent syslog server. Services - 1.0.8 + 1.0.9 ALPHA 2.2 syslog-ng-3.6.2_3-##ARCH##.pbi @@ -1523,7 +1523,7 @@ http://www.zabbix.com/product.php Services https://packages.pfsense.org/packages/config/zabbix-agent-lts/zabbix-agent-lts.xml - 0.8.6 + 0.8.7 BETA 2.2 zabbix-agent-lts.xml @@ -1550,7 +1550,7 @@ http://www.zabbix.com/product.php Services https://packages.pfsense.org/packages/config/zabbix-proxy-lts/zabbix-proxy-lts.xml - 0.8.6 + 0.8.7 BETA 2.2 zabbix-proxy-lts.xml @@ -1669,7 +1669,7 @@ http://www.apcupsd.com/ Services https://packages.pfsense.org/packages/config/apcupsd/apcupsd.xml - 0.3.7 + 0.3.8 BETA 2.2 apcupsd.xml -- cgit v1.2.3 From ac4c3e43eb28f877f4478935de941d18e0898c52 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 10:39:18 +0200 Subject: Remove include file reference since it doesn't exist any more --- config/notes/notes.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/notes/notes.xml b/config/notes/notes.xml index 7d94593f..78d3e1c6 100644 --- a/config/notes/notes.xml +++ b/config/notes/notes.xml @@ -45,7 +45,6 @@ Notes 0.2.6 Settings - /usr/local/pkg/notes.inc Notes Notes. -- cgit v1.2.3 From b27dc947e11107df6f1d6d91516b18e326d6f6bc Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 10:40:30 +0200 Subject: Remove include file reference since it doesn't exist any more Really gone. --- config/notes/notes.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/notes/notes.xml b/config/notes/notes.xml index 78d3e1c6..03c0a01a 100644 --- a/config/notes/notes.xml +++ b/config/notes/notes.xml @@ -60,10 +60,6 @@ installedpackages->package->$packagename->configuration->notes - - /usr/local/pkg/ - https://packages.pfsense.org/packages/config/notes/notes.inc - Title -- cgit v1.2.3 From 031be05caa024fa8d2c20808053ca5d0963d650c Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 10:57:13 +0200 Subject: No need to use any variables here --- config/openvpn-client-export/openvpn-client-export.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/openvpn-client-export/openvpn-client-export.inc b/config/openvpn-client-export/openvpn-client-export.inc index 1d8512ae..4dbc7302 100755 --- a/config/openvpn-client-export/openvpn-client-export.inc +++ b/config/openvpn-client-export/openvpn-client-export.inc @@ -62,8 +62,7 @@ function openvpn_client_export_install() { } function openvpn_client_export_deinstall() { - $workdir = "{$ovpndir}/client-export"; - exec("/bin/rm -r {$workdir}"); + exec("/bin/rm -r /usr/local/share/openvpn/client-export"); } function openvpn_client_export_prefix($srvid, $usrid = null, $crtid = null) { -- cgit v1.2.3 From 0f6248ec1f0717cf4778bd6cbb9fb2de43c6c809 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 11:30:14 +0200 Subject: Add missing custom_php_deinstall_command... ... so the the baculaclient_custom_php_deinstall_command() in the .inc file is actually used. --- config/bacula-client/bacula-client.xml | 3 +++ 1 file changed, 3 insertions(+) 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 @@ baculaclient_custom_php_install_command(); + + baculaclient_custom_php_deinstall_command(); + baculaclient_custom_php_write_config(); -- cgit v1.2.3 From ad07bfe7e54b242afd5df4741fbe60851cf18408 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 12:03:14 +0200 Subject: Fix things ordering here. Cannot run the package otherwise, need the user/group first. --- config/spamd/spamd.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/spamd/spamd.inc b/config/spamd/spamd.inc index bceafd09..6a6b7ca5 100644 --- a/config/spamd/spamd.inc +++ b/config/spamd/spamd.inc @@ -284,9 +284,9 @@ function custom_php_install_command() { global $config, $g; system("touch /var/db/whitelist.txt"); system("touch /var/db/blacklist.txt"); - sync_package_spamd(); 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"); + sync_package_spamd(); } function custom_php_deinstall_command() { -- cgit v1.2.3 From 3bdbee31d112b473ce66bcd321cdcd706dc17131 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 25 Aug 2015 13:06:28 +0200 Subject: stop copying spamd.conf.sample It made zero sense with the original broken commands order ( you don't configure something only to overwrite it by some sample config later on... WTF), it makes zero sense with the new one (you don't copy a sample conf to unlink it on configuration and replace with a symlink to another file.) --- config/spamd/spamd.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/config/spamd/spamd.inc b/config/spamd/spamd.inc index 6a6b7ca5..a72d8770 100644 --- a/config/spamd/spamd.inc +++ b/config/spamd/spamd.inc @@ -285,7 +285,6 @@ function custom_php_install_command() { system("touch /var/db/whitelist.txt"); system("touch /var/db/blacklist.txt"); 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"); sync_package_spamd(); } -- cgit v1.2.3