Fixes to squid setup.

Author: mpartel

misc/Makefile

@@ -20,6 +20,8 @@ DNSMASQ_DIR=$(WORK)/dnsmasq-$(DNSMASQ_VERSION)
 SQUID_DIR=$(WORK)/squid-$(SQUID_VERSION)
 
 SQUIDROOT=$(shell readlink -f .)/squidroot
+SQUID_VAR_OWNER=$(shell stat -c '%u' .)
+SQUID_VAR_GROUP=$(shell stat -c '%g' .)
 
 all: dnsmasq squid
 
@@ -41,6 +43,8 @@ squid: $(SQUIDROOT)/sbin/squid
 
 $(SQUIDROOT)/sbin/squid: $(SQUID_DIR)/src/squid
 	make -C $(SQUID_DIR) install
+	chown -R $(SQUID_VAR_OWNER) $(SQUIDROOT)/var
+	chgrp -R $(SQUID_VAR_GROUP) $(SQUIDROOT)/var
 
 $(SQUID_DIR)/src/squid: $(SQUID_DIR)/Makefile
 	make -C $(SQUID_DIR) -j$(SUBMAKE_JOBS)

uml/run-bash.sh

@@ -42,10 +42,6 @@ if [ "$1" = '-n' ]; then
 
   echo "Configuring squid"
   cat > "$SQUID_CONF" <<EOS
-acl manager proto cache_object
-acl localhost src 127.0.0.1/32 ::1
-acl to_localhost dst 127.0.0.0/8 0.0.0.0/32 ::1
-
 acl SSL_ports port 443
 acl Safe_ports port 80          # http
 acl Safe_ports port 8080  # alternative http

web/lib/squid.rb

@@ -65,10 +65,6 @@ def self.ensure_swap_dirs_created
 
   def self.write_config_file(tapdevs)
     config = <<EOS
-acl manager proto cache_object
-acl localhost src 127.0.0.1/32 ::1
-acl to_localhost dst 127.0.0.0/8 0.0.0.0/32 ::1
-
 acl SSL_ports port 443
 acl Safe_ports port 80		# http
 acl Safe_ports port 8080  # alternative http