launchpad-reviewers team mailing list archive

[Ines Almeida <mp+455796@xxxxxxxxxxxxxxxxxx>]

Ines Almeida has proposed merging ~ines-almeida/txpkgupload:charm-bump-haproxy-timeouts into txpkgupload:master.

Commit message:
charm: bump haproxy timeouts for ftp and sftp uploads

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~ines-almeida/txpkgupload/+git/txpkgupload/+merge/455796
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~ines-almeida/txpkgupload:charm-bump-haproxy-timeouts into txpkgupload:master.

diff --git a/charm/txpkgupload/config.yaml b/charm/txpkgupload/config.yaml
index c4fb6bf..f9bd5b7 100644
--- a/charm/txpkgupload/config.yaml
+++ b/charm/txpkgupload/config.yaml
@@ -22,6 +22,8 @@ options:
       - mode tcp
       - option tcplog
       - balance leastconn
+      - timeout client 1800000
+      - timeout server 1800000
   haproxy_service_options_sftp:
     type: string
     description: HAProxy options for the SFTP port.
@@ -29,6 +31,8 @@ options:
       - mode tcp
       - option tcplog
       - balance leastconn
+      - timeout client 1800000
+      - timeout server 1800000
   log_hosts_allow:
     type: string
     description: >