Merge branch 'master' of git.llucax.com.ar:/var/lib/git/software/pymin into logging

[software/pymin.git] / pymin / services / proxy / templates / squid.conf

diff --git a/pymin/services/proxy/templates/squid.conf b/pymin/services/proxy/templates/squid.conf
index 3ad5cf4400b2fb9d66d456723de0e4b751c045e4..d986f72b3b6eef77a5acc892d503b0663dc67b03 100644 (file)
--- a/pymin/services/proxy/templates/squid.conf
+++ b/pymin/services/proxy/templates/squid.conf
@@ -1,4 +1,4 @@
-auth_param basic program /usr/libexec/squid/ncsa_auth /usr/local/Squid/etc/passwd
+auth_param basic program /usr/sbin/ncsa_auth /etc/squid/users.conf

 auth_param basic children 5
 auth_param basic realm Proxy
 auth_param basic credentialsttl 2 hours
 auth_param basic children 5
 auth_param basic realm Proxy
 auth_param basic credentialsttl 2 hours


@@ -23,6 +23,8 @@ acl Safe_ports port 901         # SWAT
 acl purge method PURGE
 acl CONNECT method CONNECT
 
 acl purge method PURGE
 acl CONNECT method CONNECT
 

+acl users proxy_auth REQUIRED
+

 % for host in hosts:
 acl proxy_hosts src ${host.ip}/32
 % endfor
 % for host in hosts:
 acl proxy_hosts src ${host.ip}/32
 % endfor


@@ -34,7 +36,10 @@ http_access deny purge
 http_access deny !Safe_ports
 http_access deny CONNECT !SSL_ports
 http_access allow localhost
 http_access deny !Safe_ports
 http_access deny CONNECT !SSL_ports
 http_access allow localhost

+% if hosts:

 http_access allow proxy_hosts
 http_access allow proxy_hosts

+% endif
+http_access allow users

 http_access deny all
 
 http_port ${ip}:${port}
 http_access deny all
 
 http_port ${ip}:${port}


@@ -62,4 +67,4 @@ icp_port 0
 error_directory /usr/share/squid/errors/Spanish
 
 forwarded_for off
 error_directory /usr/share/squid/errors/Spanish
 
 forwarded_for off

-coredump_dir /var/cache/squid
\ No newline at end of file
+coredump_dir /var/cache/squid