aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeth Mos <seth.mos@xs4all.nl>2006-12-20 10:58:59 +0000
committerSeth Mos <seth.mos@xs4all.nl>2006-12-20 10:58:59 +0000
commit3e43c1c6c694588ed7caabffa3cf1f87b0be7d75 (patch)
tree520896003f4234bf4ceccb909caddff6c32594b7
parent9e38c1e55891261ad8b9d807060f483b30bfe325 (diff)
downloadpfsense-packages-3e43c1c6c694588ed7caabffa3cf1f87b0be7d75.tar.gz
pfsense-packages-3e43c1c6c694588ed7caabffa3cf1f87b0be7d75.tar.bz2
pfsense-packages-3e43c1c6c694588ed7caabffa3cf1f87b0be7d75.zip
Do not attempt to create squid cache dir on each reload.
-rw-r--r--packages/squid.inc5
1 files changed, 2 insertions, 3 deletions
diff --git a/packages/squid.inc b/packages/squid.inc
index 2423c48f..b45eac83 100644
--- a/packages/squid.inc
+++ b/packages/squid.inc
@@ -76,13 +76,13 @@ function squid_dash_z() {
$settings = $config['installedpackages']['squidcache']['config'][0];
$cachedir =($settings['harddisk_cache_location'] ? $settings['harddisk_cache_location'] : '/var/squid/cache');
- if(!is_dir($cachedir)) {
+ if(!is_dir($cachedir.'/')) {
log_error("Creating Squid cache dir $cachedir");
make_dirs($cachedir);
squid_chown_recursive($cachedir, 'proxy', 'proxy');
}
- if(!is_dir($cachedir.'/00')) {
+ if(!is_dir($cachedir.'/00/')) {
log_error("Creating squid cache subdirs in $cachedir");
mwexec("/usr/local/sbin/squid -z");
}
@@ -753,7 +753,6 @@ function squid_resync() {
if (!is_service_running('squid')) {
log_error("Starting Squid");
mwexec_bg("/usr/local/sbin/squid -D");
- mwexec_bg("/usr/local/etc/rc.d/proxy_monitor.sh");
} else {
log_error("Reloading Squid for configuration sync");
mwexec("/usr/local/sbin/squid -k reconfigure");