Commit 4b915f9b authored by Cédric Le Ninivin's avatar Cédric Le Ninivin

squid: Squid use hardcoded domain

parent 13b4dee5
...@@ -40,6 +40,9 @@ class Recipe(GenericBaseRecipe): ...@@ -40,6 +40,9 @@ class Recipe(GenericBaseRecipe):
cache-path -- location of the cache directory cache-path -- location of the cache directory
XXXX No good, specific...
domain -- domain we want to cache
ip -- ip of the squid server ip -- ip of the squid server
port -- port of the squid server port -- port of the squid server
...@@ -66,6 +69,7 @@ class Recipe(GenericBaseRecipe): ...@@ -66,6 +69,7 @@ class Recipe(GenericBaseRecipe):
access_log_path=self.options['access-log-path'], access_log_path=self.options['access-log-path'],
cache_log_path=self.options['cache-log-path'], cache_log_path=self.options['cache-log-path'],
pid_filename_path=self.options['pid-filename-path'], pid_filename_path=self.options['pid-filename-path'],
domain=self.options['domain'],
) )
template_filename = self.getTemplateFilename('squid.conf.in') template_filename = self.getTemplateFilename('squid.conf.in')
......
...@@ -8,7 +8,7 @@ http_port %(ip)s:%(port)s accel defaultsite=%(ip)s ...@@ -8,7 +8,7 @@ http_port %(ip)s:%(port)s accel defaultsite=%(ip)s
cache_peer %(backend_ip)s parent %(backend_port)s 0 no-query originserver name=backend cache_peer %(backend_ip)s parent %(backend_port)s 0 no-query originserver name=backend
acl our_sites dstdomain %(ip)s acl our_sites dstdomain %(domain)s
http_access allow our_sites http_access allow our_sites
cache_peer_access backend allow our_sites cache_peer_access backend allow our_sites
cache_peer_access backend deny all cache_peer_access backend deny all
......
...@@ -173,6 +173,7 @@ ip = $${squid-hardcoded:ip} ...@@ -173,6 +173,7 @@ ip = $${squid-hardcoded:ip}
port = $${squid-hardcoded:port} port = $${squid-hardcoded:port}
backend-ip = $${squid-hardcoded:backend-ip} backend-ip = $${squid-hardcoded:backend-ip}
backend-port = $${squid-hardcoded:backend-port} backend-port = $${squid-hardcoded:backend-port}
domain = $${squid-hardcoded:domain}
access-log-path = $${directory:log}/squid-access.log access-log-path = $${directory:log}/squid-access.log
cache-log-path = $${directory:log}/squid-cache.log cache-log-path = $${directory:log}/squid-cache.log
pid-filename-path = $${directory:run}/squid.pid pid-filename-path = $${directory:run}/squid.pid
...@@ -182,3 +183,4 @@ ip = 10.0.24.140 ...@@ -182,3 +183,4 @@ ip = 10.0.24.140
port = 26010 port = 26010
backend-ip = 10.0.24.140 backend-ip = 10.0.24.140
backend-port = 26011 backend-port = 26011
domain = softinst34784.bateau.org
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment