Merge ~ines-almeida/txpkgupload:remove-passive-ftp-ports-from-sftp-haproxy-config into txpkgupload:master

Proposed by Ines Almeida
Status: Merged
Approved by: Ines Almeida
Approved revision: fa07baa766c000ace96f4b3dd66734455a1a9dc2
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~ines-almeida/txpkgupload:remove-passive-ftp-ports-from-sftp-haproxy-config
Merge into: txpkgupload:master
Diff against target: 12 lines (+0/-1)
1 file modified
charm/txpkgupload/reactive/txpkgupload.py (+0/-1)
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+455770@code.launchpad.net

Commit message

Remove passive ftp ports from sftp haproxy config

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm/txpkgupload/reactive/txpkgupload.py b/charm/txpkgupload/reactive/txpkgupload.py
2index bb22539..f0d5de6 100644
3--- a/charm/txpkgupload/reactive/txpkgupload.py
4+++ b/charm/txpkgupload/reactive/txpkgupload.py
5@@ -251,7 +251,6 @@ def configure_loadbalancer():
6 f"{config['min_passive_port']}-{config['max_passive_port']}"
7 )
8 service_options_ftp.append(extra_ports)
9- service_options_sftp.append(extra_ports)
10
11 ftp_port = config["ftp_port"]
12 sftp_port = config["sftp_port"]

Subscribers

People subscribed via source and target branches

to all changes: