Incorporate Ermal's comments into Suricata BETA pkg code.

1 files changed, 12 insertions, 55 deletions

diff --git a/config/suricata/suricata_uninstall.php b/config/suricata/suricata_uninstall.php
index 808aefec..071a89a4 100644
--- a/config/suricata/suricata_uninstall.php
+++ b/config/suricata/suricata_uninstall.php
@@ -42,11 +42,8 @@ log_error(gettext("[Suricata] Suricata package uninstall in progress..."));
 /* Log a message only if a running process is detected */
 if (is_service_running("suricata"))
 	log_error(gettext("[Suricata] Suricata STOP for all interfaces..."));
-
-mwexec('/usr/bin/killall -z suricata', true);
-sleep(2);
-mwexec('/usr/bin/killall -9 suricata', true);
-sleep(2);
+killbyname("suricata");
+sleep(1);
 
 // Delete any leftover suricata PID files in /var/run
 array_map('@unlink', glob("/var/run/suricata_*.pid"));
@@ -55,11 +52,8 @@ array_map('@unlink', glob("/var/run/suricata_*.pid"));
 /* Log a message only if a running process is detected     */
 if (is_service_running("barnyard2"))
 	log_error(gettext("[Suricata] Barnyard2 STOP for all interfaces..."));
-
-mwexec('/usr/bin/killall -z barnyard2', true);
-sleep(2);
-mwexec('/usr/bin/killall -9 barnyard2', true);
-sleep(2);
+killbyname("barnyard2");
+sleep(1);
 
 // Delete any leftover barnyard2 PID files in /var/run
 array_map('@unlink', glob("/var/run/barnyard2_*.pid"));
@@ -67,58 +61,21 @@ array_map('@unlink', glob("/var/run/barnyard2_*.pid"));
 /* Remove the suricata user and group */
 mwexec('/usr/sbin/pw userdel suricata; /usr/sbin/pw groupdel suricata', true);
 
-/* Remove suricata cron entries Ugly code needs smoothness */
-if (!function_exists('suricata_deinstall_cron')) {
-	function suricata_deinstall_cron($crontask) {
-		global $config, $g;
-
-		if(!is_array($config['cron']['item']))
-			return;
-
-		$x=0;
-		$is_installed = false;
-		foreach($config['cron']['item'] as $item) {
-			if (strstr($item['command'], $crontask)) {
-				$is_installed = true;
-				break;
-			}
-			$x++;
-		}
-		if ($is_installed == true)
-			unset($config['cron']['item'][$x]);
-	}
-}
-
-/* Remove all the Suricata cron jobs. */
-suricata_deinstall_cron("suricata_check_for_rule_updates.php");
-suricata_deinstall_cron("suricata_check_cron_misc.inc");
-configure_cron();
-
-/**********************************************************/
-/* Test for existence of library backup tarballs in /tmp. */
-/* If these are present, then a package "delete"          */
-/* operation is in progress and we need to wipe out the   */
-/* configuration files.  Otherwise we leave the binary-   */
-/* side configuration intact since only a GUI files       */
-/* deinstall and reinstall operation is in progress.      */
-/*							  */
-/* XXX: hopefully a better method presents itself in      */
-/*      future versions of pfSense.                       */
-/**********************************************************/
-if (file_exists("/tmp/pkg_libs.tgz") || file_exists("/tmp/pkg_bins.tgz")) {
-	log_error(gettext("[Suricata] Package deletion requested... removing all package files..."));
-	mwexec("/bin/rm -f {$rcdir}/suricata.sh");
-	mwexec("/bin/rm -rf /usr/local/etc/suricata");
-	mwexec("/bin/rm -rf /usr/local/pkg/suricata");
-	mwexec("/bin/rm -rf /usr/local/www/suricata");
-}
+/* Remove the Suricata cron jobs. */
+install_cron_job("/usr/bin/nice -n20 /usr/local/bin/php -f /usr/local/www/suricata/suricata_check_for_rule_updates.php", false);
+install_cron_job("/usr/bin/nice -n20 /usr/local/bin/php -f /usr/local/pkg/suricata/suricata_check_cron_misc.inc", false);
 
+/* See if we are to keep Suricata log files on uninstall */
 if ($config['installedpackages']['suricata']['config'][0]['clearlogs'] == 'on') {
 	log_error(gettext("[Suricata] Clearing all Suricata-related log files..."));
 	@unlink("{$suricata_rules_upd_log}");
 	mwexec("/bin/rm -rf {$suricatalogdir}");
 }
 
+/* Remove the Suricata GUI app directories */
+@unlink("/usr/local/pkg/suricata");
+@unlink("/usr/local/www/suricata");
+
 /* Keep this as a last step */
 if ($config['installedpackages']['suricata']['config'][0]['forcekeepsettings'] != 'on') {
 	log_error(gettext("Not saving settings... all Suricata configuration info and logs deleted..."));