Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Gwenaël Samain
slapos
Commits
e79fc0b7
Commit
e79fc0b7
authored
Aug 02, 2012
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use 6tunnel instead of haproxy.
parent
4d3b4f32
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
24 deletions
+3
-24
slapos/recipe/ipv6toipv4/__init__.py
slapos/recipe/ipv6toipv4/__init__.py
+2
-8
slapos/recipe/ipv6toipv4/template/configuration.cfg.in
slapos/recipe/ipv6toipv4/template/configuration.cfg.in
+0
-15
slapos/recipe/ipv6toipv4/template/run.in
slapos/recipe/ipv6toipv4/template/run.in
+1
-1
No files found.
slapos/recipe/ipv6toipv4/__init__.py
View file @
e79fc0b7
...
@@ -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
]
slapos/recipe/ipv6toipv4/template/configuration.cfg.in
deleted
100644 → 0
View file @
4d3b4f32
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
slapos/recipe/ipv6toipv4/template/run.in
View file @
e79fc0b7
#!%(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
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