squid: Squid use hardcoded domain

slapos/recipe/squid/__init__.py

@@ -40,6 +40,9 @@ class Recipe(GenericBaseRecipe):
 
   cache-path -- location of the cache directory
 
+  XXXX No good, specific...
+  domain -- domain we want to cache
+
   ip -- ip of the squid server
 
   port -- port of the squid server
@@ -66,6 +69,7 @@ class Recipe(GenericBaseRecipe):
       access_log_path=self.options['access-log-path'],
       cache_log_path=self.options['cache-log-path'],
       pid_filename_path=self.options['pid-filename-path'],
+      domain=self.options['domain'],
       )
 
     template_filename = self.getTemplateFilename('squid.conf.in')

slapos/recipe/squid/template/squid.conf.in

@@ -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
 
-acl our_sites dstdomain %(ip)s
+acl our_sites dstdomain %(domain)s
 http_access allow our_sites
 cache_peer_access backend allow our_sites
 cache_peer_access backend deny all

software/apache-frontend/instance.cfg

@@ -173,6 +173,7 @@ ip = $${squid-hardcoded:ip}
 port = $${squid-hardcoded:port}
 backend-ip = $${squid-hardcoded:backend-ip}
 backend-port = $${squid-hardcoded:backend-port}
+domain = $${squid-hardcoded:domain}
 access-log-path = $${directory:log}/squid-access.log
 cache-log-path = $${directory:log}/squid-cache.log
 pid-filename-path = $${directory:run}/squid.pid
@@ -182,3 +183,4 @@ ip = 10.0.24.140
 port = 26010
 backend-ip = 10.0.24.140
 backend-port = 26011
+domain = softinst34784.bateau.org
\ No newline at end of file