Provides Sphinx over IPv6.

stack/erp5/buildout.cfg

@@ -204,7 +204,7 @@ extra-context =
 [template-sphinx]
 < = template-jinja2-base
 filename = instance-sphinx.cfg
-md5sum = e3975afd5220f251d6b6e7024a2ca08b
+md5sum = c9d510c55a8f3562fe6346907002d4df
 extra-context =
     key sphinx_location sphinx:location
 

stack/erp5/instance-sphinx.cfg.in

@@ -9,8 +9,8 @@ offline = true
 
 [publish-sphinx-url]
 recipe = slapos.cookbook:publish
-url-sphinx = sphinx://${sphinxd-instance:ip}:${sphinxd-instance:sphinx-port}
-url-sphinx-sql = mysql://${sphinxd-instance:ip}:${sphinxd-instance:sql-port}
+url-sphinx = sphinx://[${sphinx-tunnel:ipv6}]:${sphinx-tunnel:ipv6-port}
+url-sphinx-sql = mysql://[${sphinx-sql-tunnel:ipv6}]:${sphinx-sql-tunnel:ipv6-port}
 
 [sphinxd-instance]
 recipe = slapos.cookbook:sphinx
@@ -25,6 +25,27 @@ sql-port = 9306
 wrapper = ${basedirectory:services}/sphinxd
 sphinx-searchd-binary = {{ sphinx_location }}/bin/searchd
 
+[ipv6toipv4-base]
+recipe = slapos.cookbook:ipv6toipv4
+conf-path = ${rootdirectory:etc}/${:base-name}.conf
+runner-path = ${basedirectory:services}/${:base-name}
+haproxy-path = {{ haproxy_location }}/sbin/haproxy
+shell-path = {{ dash_location }}/bin/dash
+ipv4 = ${sphinxd-instance:ip}
+ipv6 = ${slap-network-information:global-ipv6}
+
+[sphinx-tunnel]
+< = ipv6toipv4-base
+base-name = sphinx-tunnel
+ipv6-port = ${sphinxd-instance:sphinx-port}
+ipv4-port = ${sphinxd-instance:sphinx-port}
+
+[sphinx-sql-tunnel]
+< = ipv6toipv4-base
+base-name = sphinx-sql-tunnel
+ipv6-port = ${sphinxd-instance:sql-port}
+ipv4-port = ${sphinxd-instance:sql-port}
+
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory
 etc = ${buildout:directory}/etc