Provide access cloudoo over IPv6.

stack/erp5/buildout.cfg

@@ -234,7 +234,7 @@ mode = 640
 [template-cloudooo]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
-md5sum = 53492e520be57f4c6a9eacd107c8d446
+md5sum = 5b56a84b779f72c279adb4ed3b12e512
 mode = 640
 
 [template-zope-conf]
@@ -248,7 +248,7 @@ mode = 640
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 9704211fdbed6b23854dcc2222d387c4
+md5sum = e55c79ce2e52a9895980b3800e8a12fe
 extra-context =
     key apache_location apache:location
     key aspell_location aspell:location

stack/erp5/instance-cloudoo.cfg.in

@@ -7,13 +7,14 @@ parts =
   cloudooo-instance
   promise
   promise-openoffice
+  promise-tunnel
 eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 [publish-cloudooo-connection-information]
 recipe = slapos.cookbook:publishurl
-url = cloudooo://${cloudooo-instance:ip}:${cloudooo-instance:port}/
+url = cloudooo://[${ipv6toipv4:ipv6}]:${ipv6toipv4:ipv6-port}/
 
 [cloudooo-instance]
 recipe = slapos.cookbook:generic.cloudooo
@@ -61,6 +62,24 @@ path = ${directory:promise}/openoffice
 hostname = ${cloudooo-instance:ip}
 port = ${cloudooo-instance:openoffice-port}
 
+[promise-tunnel]
+recipe = slapos.cookbook:check_port_listening
+path = ${directory:promise}/tunnel
+hostname = ${ipv6toipv4:ipv6}
+port = ${ipv6toipv4:ipv6-port}
+
+[ipv6toipv4]
+recipe = slapos.cookbook:ipv6toipv4
+conf-path = ${directory:etc}/${:base-name}.conf
+runner-path = ${directory:service}/${:base-name}
+haproxy-path = {{ parameter_dict['haproxy'] }}/sbin/haproxy
+shell-path = {{ parameter_dict['dash'] }}/bin/dash
+ipv4 = ${cloudooo-instance:ip}
+ipv6 = ${slap-network-information:global-ipv6}
+ipv6-port = ${cloudooo-instance:port}
+ipv4-port = ${cloudooo-instance:port}
+base-name = cloudooo-tunnel
+
 # rest of parts are candidates for some generic stuff
 [directory]
 recipe = slapos.cookbook:mkdirectory

stack/erp5/instance.cfg.in

@@ -42,6 +42,8 @@ zlib = {{ zlib_location }}
 libreoffice-bin = {{ libreoffice_bin_location }}
 fonts = {{ fonts_location }}
 buildout-bin-directory = {{ buildout_bin_directory }}
+haproxy = {{ haproxy_location }}
+dash = {{ dash_location }}
 
 [dynamic-template-cloudooo]
 < = jinja2-template-base