Merge ~ines-almeida/launchpad-mojo-specs:lp-update-txpkgupload-charm-options into launchpad-mojo-specs:master

Proposed by Ines Almeida
Status: Merged
Merged at revision: 666443f20ccf9bea25eb7b3811300867ee25ae91
Proposed branch: ~ines-almeida/launchpad-mojo-specs:lp-update-txpkgupload-charm-options
Merge into: launchpad-mojo-specs:master
Diff against target: 23 lines (+12/-0)
1 file modified
lp/bundle.yaml (+12/-0)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+455797@code.launchpad.net

Commit message

lp: update txpkgupload-ppa charm options to increase haproxy timeouts

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
diff --git a/lp/bundle.yaml b/lp/bundle.yaml
index 91a6851..bc2341a 100644
--- a/lp/bundle.yaml
+++ b/lp/bundle.yaml
@@ -1173,6 +1173,18 @@ applications:
1173 revision: 281173 revision: 28
1174 options: {{ txpkgupload_payload_options() }}1174 options: {{ txpkgupload_payload_options() }}
1175 haproxy_ipv4_address: "{{ ppa_lb_ipv4_address }}"1175 haproxy_ipv4_address: "{{ ppa_lb_ipv4_address }}"
1176 haproxy_service_options_ftp: |
1177 - mode tcp
1178 - option tcplog
1179 - balance leastconn
1180 - timeout client 1800000
1181 - timeout server 1800000
1182 haproxy_service_options_sftp: |
1183 - mode tcp
1184 - option tcplog
1185 - balance leastconn
1186 - timeout client 1800000
1187 - timeout server 1800000
1176 max_passive_port: 205001188 max_passive_port: 20500
1177 min_passive_port: 200001189 min_passive_port: 20000
1178 ppa-apache2:1190 ppa-apache2:

Subscribers

People subscribed via source and target branches