Commit d9bc7f2f authored by Romain Courteaud's avatar Romain Courteaud

Fix memcached tunnel.

parent 596ac9b2
...@@ -307,7 +307,7 @@ extra-context = ...@@ -307,7 +307,7 @@ extra-context =
[template-memcached] [template-memcached]
< = template-jinja2-base < = template-jinja2-base
filename = instance-memcached.cfg filename = instance-memcached.cfg
md5sum = 2357f68ab98f73cd7911581d68d7d050 md5sum = 594d3195b258906d4a3fde09c01c917c
extra-context = extra-context =
key dash_location dash:location key dash_location dash:location
key haproxy_location haproxy:location key haproxy_location haproxy:location
......
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
[buildout] [buildout]
parts = parts =
publish-memcached-connection-information publish-memcached-connection-information
promise haproxy-promise
tunnel-promise
eggs-directory = {{ eggs_directory }} eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }} develop-eggs-directory = {{ develop_eggs_directory }}
...@@ -31,8 +32,8 @@ port = 11000 ...@@ -31,8 +32,8 @@ port = 11000
[ipv6toipv4] [ipv6toipv4]
recipe = slapos.cookbook:ipv6toipv4 recipe = slapos.cookbook:ipv6toipv4
conf-path = ${rootdirectory:etc}/${:base-name}.conf conf-path = ${directory:etc}/${:base-name}.conf
runner-path = ${basedirectory:services}/${:base-name} runner-path = ${directory:service}/${:base-name}
haproxy-path = {{ haproxy_location }}/sbin/haproxy haproxy-path = {{ haproxy_location }}/sbin/haproxy
shell-path = {{ dash_location }}/bin/dash shell-path = {{ dash_location }}/bin/dash
ipv4 = ${memcached-instance:ip} ipv4 = ${memcached-instance:ip}
......
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