launchpad-reviewers team mailing list archive

[Colin Watson <mp+455556@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/txpkgupload:charm-ipv6 into txpkgupload:master.

Commit message:
charm: Make haproxy listen on both IPv4 and IPv6

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/txpkgupload/+git/txpkgupload/+merge/455556
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/txpkgupload:charm-ipv6 into txpkgupload:master.

diff --git a/charm/txpkgupload/reactive/txpkgupload.py b/charm/txpkgupload/reactive/txpkgupload.py
index 201e3a9..f702b1d 100644
--- a/charm/txpkgupload/reactive/txpkgupload.py
+++ b/charm/txpkgupload/reactive/txpkgupload.py
@@ -241,7 +241,7 @@ def configure_loadbalancer():
     # usual FTP/SFTP ports but also to higher ports
     if config.get("min_passive_port") and config.get("max_passive_port"):
         extra_ports = (
-            f"bind 0.0.0.0:"
+            f"bind :::"
             f"{config['min_passive_port']}-{config['max_passive_port']}"
         )
         service_options_ftp.append(extra_ports)
@@ -254,7 +254,7 @@ def configure_loadbalancer():
         {
             "service_name": "txpkgupload-ftp",
             "service_port": ftp_port,
-            "service_host": "0.0.0.0",
+            "service_host": "::",
             "service_options": service_options_ftp,
             "servers": [
                 [
@@ -271,7 +271,7 @@ def configure_loadbalancer():
         {
             "service_name": "txpkgupload-sftp",
             "service_port": sftp_port,
-            "service_host": "0.0.0.0",
+            "service_host": "::",
             "service_options": service_options_sftp,
             "servers": [
                 [