From bb3c2ac31d526e96ac473ce1bccf227a48c8f85e Mon Sep 17 00:00:00 2001
From: Marcello Coutinho <marcellocoutinho@gmail.com>
Date: Fri, 4 May 2012 03:13:01 +0000
Subject: dansguardian,squid3 - more fixes to startup process during boot

---
 config/dansguardian/dansguardian.inc |  7 ++-----
 config/squid-reverse/squid.inc       | 33 ++++++++++++++++++---------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/config/dansguardian/dansguardian.inc b/config/dansguardian/dansguardian.inc
index a327546d..850c04e0 100755
--- a/config/dansguardian/dansguardian.inc
+++ b/config/dansguardian/dansguardian.inc
@@ -1078,11 +1078,8 @@ EOF;
 			exec("/usr/local/sbin/dansguardian -r");
 			}
 		else{
-			# dansguardian is started by rc.d script during boot time
-			if(!isset($boot_process)){
-				log_error('Starting Dansguardian');
-				mwexec("$script start");
-				}
+			log_error('Starting Dansguardian');
+			mwexec("$script start");
 			}
 	}
 	else{
diff --git a/config/squid-reverse/squid.inc b/config/squid-reverse/squid.inc
index 073468e5..b6386eaa 100644
--- a/config/squid-reverse/squid.inc
+++ b/config/squid-reverse/squid.inc
@@ -1340,6 +1340,9 @@ function squid_resync() {
 			$boot_process="on";
 	}
 	
+	if (is_process_running('squid') && isset($boot_process))
+		return;
+	
 	conf_mount_rw();
 	foreach (array(	SQUID_CONFBASE,
 			SQUID_ACLDIR,
@@ -1351,22 +1354,22 @@ function squid_resync() {
 		chgrp($dir, 'proxy');
 		squid_chown_recursive($dir, 'proxy', 'proxy');
 	}
-	if (!isset($boot_process)){
-		$conf = squid_resync_general() . "\n";
-		$conf .= squid_resync_cache() . "\n";
-		$conf .= squid_resync_redirector() . "\n";
-		$conf .= squid_resync_upstream() . "\n";
-		$conf .= squid_resync_nac() . "\n";
-		$conf .= squid_resync_traffic() . "\n";
-		$conf .= squid_resync_reverse() . "\n";	
-		$conf .= squid_resync_auth();
-		squid_resync_users();
-		squid_write_rcfile();
+	$conf = squid_resync_general() . "\n";
+	$conf .= squid_resync_cache() . "\n";
+	$conf .= squid_resync_redirector() . "\n";
+	$conf .= squid_resync_upstream() . "\n";
+	$conf .= squid_resync_nac() . "\n";
+	$conf .= squid_resync_traffic() . "\n";
+	$conf .= squid_resync_reverse() . "\n";	
+	$conf .= squid_resync_auth();
+	squid_resync_users();
+	squid_write_rcfile();
+		
+	if(!isset($boot_process))
 		squid_sync_on_changes();
-
-		#write config file
-		file_put_contents(SQUID_CONFBASE . '/squid.conf', $conf);
-		}
+	
+	#write config file
+	file_put_contents(SQUID_CONFBASE . '/squid.conf', $conf);
 		
 	/* make sure pinger is executable */
 	if(file_exists("/usr/local/libexec/squid/pinger"))
-- 
cgit v1.2.3