Projet

Général

Profil

squid.diff

Emmanuel GARETTE, 13/02/2012 21:44

Télécharger (2,87 ko)

Voir les différences:

/usr/share/eole/creole/distrib/squid.conf 2012-02-13 21:03:38.091629287 +0100
914 914
# acl for request coming from root container (used for snmp querying)
915 915
acl lxcroot src %%adresse_ip_br0/32
916 916

  
917
%if %%proxy_sibling_ip != []
918
#sibling
919
acl src_sibling src %slurp
920
%for %%proxy_sibling in %%proxy_sibling_ip
921
 %%proxy_sibling/32
922
%end for
923

  
924
%end if
917 925
#  TAG: follow_x_forwarded_for
918 926
#	Allowing or Denying the X-Forwarded-For header to be followed to
919 927
#	find the original source of a request.
......
1210 1218
##icp_access allow localnet
1211 1219
##icp_access deny all
1212 1220
#Default:
1221
%if %%proxy_sibling_ip != []
1222
icp_access allow src_sibling
1223
%end if
1213 1224
icp_access deny all
1214 1225

  
1215 1226
#  TAG: htcp_access
......
2209 2220
#
2210 2221
#Default:
2211 2222
# none
2212
%if %%nom_cache_pere_zone != ['']
2223
%if %%nom_cache_pere_zone != []
2213 2224
%for %%cache_iter in %%purge_list(%%nom_cache_pere_zone)
2214 2225
cache_peer %%cache_iter parent %%cache_iter.port_cache_pere_zone 7 proxy-only no-query
2215 2226
%end for
2216 2227
%end if
2217
%if %%nom_cache_pere != '' and %%nom_cache_pere_zone != ['']
2218
cache_peer %%nom_cache_pere parent %%port_cache_pere 7 no-query
2228

  
2229
%if %%nom_cache_pere != []
2230
%if %%len(%%nom_cache_pere) == 1
2231
%for %%nom_cache in %%nom_cache_pere
2232
%if %%nom_cache_pere_zone != []
2233
cache_peer %%nom_cache parent %%nom_cache.port_cache_pere 7 no-query default
2234
%else
2235
cache_peer %%nom_cache parent %%nom_cache.port_cache_pere 7 no-query
2236
%end if
2237
%end for
2238
%else
2239
%for %%nom_cache in %%nom_cache_pere
2240
cache_peer %%nom_cache parent %%nom_cache.port_cache_pere 7 no-query round-robin
2241
%end for
2219 2242
%end if
2220
#
2221
%if %%nom_cache_pere != '' and  %%nom_cache_pere_zone == ['']
2222
cache_peer %%nom_cache_pere parent %%port_cache_pere 7 no-query default
2223 2243
%end if
2224 2244

  
2245
%if %%proxy_sibling_ip != []
2246
%for %%proxy_sibling in %%proxy_sibling_ip
2247
cache_peer %%proxy_sibling sibling %%proxy_sibling.proxy_sibling_port %%icp_port proxy-only
2248
%end for
2249
%end if
2225 2250
#  TAG: cache_peer_domain
2226 2251
#	Use to limit the domains for which a neighbor cache will be
2227 2252
#	queried.  Usage:
......
2252 2277
# none
2253 2278
##EOLE
2254 2279
# Amon derriere un routeur sur reseau acad
2255
%if %%nom_cache_pere != ''
2256
cache_peer_domain %%nom_cache_pere !%%nom_domaine_local
2280
%if %%nom_cache_pere != ['']
2281
%for %%nom_cache in %%nom_cache_pere
2282
cache_peer_domain %%nom_cache !%%nom_domaine_local
2283
%end for
2257 2284
%end if
2258 2285

  
2259 2286
# Amon + VPN
......
2275 2302
#Default:
2276 2303
# none
2277 2304
##EOLE
2278
%if %%nom_cache_pere != ''
2279
cache_peer_access %%nom_cache_pere allow all
2305
%if %%nom_cache_pere != ['']
2306
%for %%nom_cache in %%nom_cache_pere
2307
cache_peer_access %%nom_cache allow all
2308
%end for
2280 2309
%end if
2281 2310
%if %%nom_cache_pere_zone != ['']
2282 2311
%for %%cache_iter in %%nom_cache_pere_zone
......
5140 5169
#Default:
5141 5170
# none
5142 5171
always_direct allow localdom
5143
%if %%nom_cache_pere != ''
5172
%if %%nom_cache_pere != []
5144 5173
always_direct allow localdest
5145 5174
%if %%is_defined('install_rvp')
5146 5175
%if %%proxy_pere_rvp == 'non'