Mysql : stunnel configuration

19db1417 · Cédric de Saint Martin · a5534d1a · 19db1417 · 19db1417
Commit 19db1417 authored Jun 06, 2011 by Cédric de Saint Martin
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

slapos/recipe/mysql/__init__.py slapos/recipe/mysql/__init__.py +2 -1

slapos/recipe/mysql/template/stunnel.conf.in slapos/recipe/mysql/template/stunnel.conf.in +2 -2

No files found.
--- a/slapos/recipe/mysql/__init__.py
+++ b/slapos/recipe/mysql/__init__.py
@@ -210,7 +210,8 @@ class Recipe(BaseSlapRecipe):
    log = os.path.join(self.log_directory, 'stunnel.log')
    pid_file = os.path.join(self.run_directory, 'stunnel.pid')
    stunnel_conf = dict(
-        ip=ip,
+        ipv6=ip,
+        ipv4=self.getLocalIPv4Address,
        port=port,
        pid_file=pid_file,
        log=log,

--- a/slapos/recipe/mysql/template/stunnel.conf.in
+++ b/slapos/recipe/mysql/template/stunnel.conf.in
@@ -10,5 +10,5 @@ cert = %(cert)s
 ;key = /etc/ssl/certs/stunnel.pem
 [mysqls]
-accept = %(ip)s:%(port)s
+accept = %(ipv6)s:%(port)s
-connect = %(external_port)s
+connect = %(ipv4)s:%(external_port)s