Commit e79fc0b7 authored by Romain Courteaud's avatar Romain Courteaud

Use 6tunnel instead of haproxy.

parent 4d3b4f32
...@@ -39,20 +39,14 @@ class Recipe(GenericBaseRecipe): ...@@ -39,20 +39,14 @@ class Recipe(GenericBaseRecipe):
ipv4=self.options['ipv4'], ipv4=self.options['ipv4'],
ipv4_port=self.options['ipv4-port'], ipv4_port=self.options['ipv4-port'],
shell_path=self.options['shell-path'], shell_path=self.options['shell-path'],
haproxy_path=self.options['haproxy-path'], tunnel6_path=self.options['tunnel6-path'],
conf_path=self.options['conf-path'],
) )
configuration_path = self.createFile(
self.options['conf-path'],
self.substituteTemplate(self.getTemplateFilename('configuration.cfg.in'),
config))
runner_path = self.createExecutable( runner_path = self.createExecutable(
self.options['runner-path'], self.options['runner-path'],
self.substituteTemplate(self.getTemplateFilename('run.in'), self.substituteTemplate(self.getTemplateFilename('run.in'),
config)) config))
return [runner_path, configuration_path] return [runner_path]
global
maxconn 4096
defaults
log global
mode tcp
option dontlognull
retries 3
contimeout 5000
clitimeout 50000
srvtimeout 50000
listen ipv6toipv4 %(ipv6)s:%(ipv6_port)s
mode tcp
server ipv4server %(ipv4)s:%(ipv4_port)s
#!%(shell_path)s #!%(shell_path)s
# BEWARE: This file is operated by slapgrid # BEWARE: This file is operated by slapgrid
# BEWARE: It will be overwritten automatically # BEWARE: It will be overwritten automatically
exec %(haproxy_path)s -f %(conf_path)s exec %(tunnel6_path)s -6 -4 -d -l %(ipv6)s %(ipv6_port)s %(ipv4)s %(ipv4_port)s
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