Commit b019f3c0 authored by Romain Courteaud's avatar Romain Courteaud

Provides memcached over IPv6.

parent 0ab278c0
...@@ -307,9 +307,10 @@ extra-context = ...@@ -307,9 +307,10 @@ extra-context =
[template-memcached] [template-memcached]
< = template-jinja2-base < = template-jinja2-base
filename = instance-memcached.cfg filename = instance-memcached.cfg
md5sum = 44c507e9eec1003beb99f9063b5e09be md5sum = 2357f68ab98f73cd7911581d68d7d050
extra-context = extra-context =
key dash_location dash:location key dash_location dash:location
key haproxy_location haproxy:location
key memcached_location memcached:location key memcached_location memcached:location
[template-erp5-development] [template-erp5-development]
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
############################# #############################
[buildout] [buildout]
parts = parts =
memcached-instance
publish-memcached-connection-information publish-memcached-connection-information
promise promise
...@@ -30,13 +29,31 @@ shell-path = {{ dash_location }}/bin/dash ...@@ -30,13 +29,31 @@ shell-path = {{ dash_location }}/bin/dash
ip = ${slap-network-information:local-ipv4} ip = ${slap-network-information:local-ipv4}
port = 11000 port = 11000
[ipv6toipv4]
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 = ${memcached-instance:ip}
ipv6 = ${slap-network-information:global-ipv6}
ipv6-port = ${memcached-instance:port}
ipv4-port = ${memcached-instance:port}
base-name = memcached-tunnel
[publish-memcached-connection-information] [publish-memcached-connection-information]
recipe = slapos.cookbook:publishurl recipe = slapos.cookbook:publishurl
url = memcached://${memcached-instance:ip}:${memcached-instance:port}/ url = memcached://[${ipv6toipv4:ipv6}]:${ipv6toipv4:ipv6-port}/
# Deploy zope promises scripts # Deploy promises scripts
[promise] [haproxy-promise]
recipe = slapos.cookbook:check_port_listening recipe = slapos.cookbook:check_port_listening
path = ${directory:promise}/memcache path = ${directory:promise}/memcache
hostname = ${memcached-instance:ip} hostname = ${memcached-instance:ip}
port = ${memcached-instance:port} port = ${memcached-instance:port}
[tunnel-promise]
recipe = slapos.cookbook:check_port_listening
path = ${directory:promise}/tunnel
hostname = ${ipv6toipv4:ipv6}
port = ${ipv6toipv4:ipv6-port}
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