Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Guillaume Hervier
slapos-caddy
Commits
d9bc7f2f
Commit
d9bc7f2f
authored
Jul 24, 2012
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix memcached tunnel.
parent
596ac9b2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+1
-1
stack/erp5/instance-memcached.cfg.in
stack/erp5/instance-memcached.cfg.in
+4
-3
No files found.
stack/erp5/buildout.cfg
View file @
d9bc7f2f
...
@@ -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
...
...
stack/erp5/instance-memcached.cfg.in
View file @
d9bc7f2f
...
@@ -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 = ${
root
directory: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}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment