wok diff squid/receipt @ rev 12059

removing cp for desktop files. that's all for tonight
author Samuel Trassare <samuel_trassare@yahoo.com>
date Wed Mar 07 22:30:33 2012 -0800 (2012-03-07)
parents 62ac523231e8
children 9fcb4e22a04f
line diff
     1.1 --- a/squid/receipt	Wed Feb 29 22:08:35 2012 +0100
     1.2 +++ b/squid/receipt	Wed Mar 07 22:30:33 2012 -0800
     1.3 @@ -50,7 +50,7 @@
     1.4  genpkg_rules()
     1.5  {
     1.6  	mkdir -p $fs/usr/share/squid/errors $fs/var/cache/squid $fs/var/log/squid \
     1.7 -		$fs/usr/lib/squid
     1.8 +		$fs/usr/lib/squid $fs/etc/squid/conf.d
     1.9  	
    1.10  	touch $fs/var/log/squid/cache.log
    1.11  	
    1.12 @@ -72,9 +72,6 @@
    1.13  	
    1.14  	sed -i \
    1.15  		-e 's/TAG: visible_hostname/TAG: visible_hostname\nvisible_hostname slitaz/' \
    1.16 -		-e 's|^access_log /var/logs|access_log /var/log/squid|' \
    1.17 -		-e 's|^#cache_store_log /var/logs|cache_store_log /var/cache/squid|' \
    1.18 -		-e 's|^#cache_log /var/logs|cache_log /var/cache/squid|' \
    1.19  		-e 's|^#cache_dir ufs /var/cache 100|cache_dir ufs /var/cache/squid 256|' \
    1.20  		-e 's|^#pid_filename /var/logs|pid_filename /var/run/squid.pid|' \
    1.21  		-e "s|^coredump_dir.*|coredump_dir /var/cache/squid|" \
    1.22 @@ -87,7 +84,11 @@
    1.23  cache_effective_user squid
    1.24  cache_effective_group squid 
    1.25  
    1.26 -access_log /var/log/squid
    1.27 +access_log /var/log/squid/access.log
    1.28 +cache_log /var/log/squid/cache.log
    1.29 +cache_store_log /var/log/squid/store.log
    1.30 +
    1.31 +include /etc/squid/conf.d/*.conf
    1.32  EOF
    1.33  }
    1.34