diff options
| author | Pedro Alvarez Piedehierro <palvarez89@gmail.com> | 2017-07-13 18:10:09 +0000 |
|---|---|---|
| committer | Pedro Alvarez Piedehierro <palvarez89@gmail.com> | 2017-07-13 18:10:09 +0000 |
| commit | dbe1204d2e77192cdece1f75a4db8df40e132ca4 (patch) | |
| tree | 306a5081ce3c70448c5a2a0a7677a13e12415be5 /baserock_frontend/haproxy.cfg | |
| parent | 0fa11e29ac99d58fc360a1617c028e7882f39246 (diff) | |
| parent | 4911e85f7cb19049c05227dbc12ef65bc25b1224 (diff) | |
| download | infrastructure-dbe1204d2e77192cdece1f75a4db8df40e132ca4.tar.gz | |
Merge branch 'sam/ostree' into 'master'
Add ostree.baserock.org definitions
See merge request !5
Diffstat (limited to 'baserock_frontend/haproxy.cfg')
| -rw-r--r-- | baserock_frontend/haproxy.cfg | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/baserock_frontend/haproxy.cfg b/baserock_frontend/haproxy.cfg index 76494878..f15c9a4d 100644 --- a/baserock_frontend/haproxy.cfg +++ b/baserock_frontend/haproxy.cfg @@ -67,6 +67,10 @@ frontend https-in use_backend baserock_openid_provider_http if { hdr(host) -m beg -i openid } + acl host_ostree hdr(host) -m beg -i ostree + acl host_ostree hdr(host) -m beg -i cache + use_backend baserock_ostree_http if host_ostree + frontend ssh-in: # FIXME: it'd be better if we could limit traffic on port 29418 to # gerrit.baserock.org. There's no way of knowing from an SSH request @@ -78,6 +82,15 @@ frontend ssh-in: bind *:29418 default_backend baserock_gerrit_ssh + # Uploading artifacts can be slow; need a long timeout. + timeout client 12h + + # Similarly, port 22200 on any instance forwards SSH to the ostree + # machine + mode tcp + bind *:22200 + default_backend baserock_ostree_ssh + # It's very annoying for 'gerrit stream-events' to have disconnection # after 50 seconds! timeout client 1h @@ -96,7 +109,6 @@ backend baserock_gerrit_http backend baserock_gerrit_ssh mode tcp server baserock_gerrit 192.168.222.69:29418 - # It's very annoying for 'gerrit stream-events' to have disconnection # after 50 seconds! timeout server 1h @@ -107,5 +119,14 @@ backend baserock_irclogs_http backend baserock_openid_provider_http server baserock_openid_provider 192.168.222.144:80 +backend baserock_ostree_http + server baserock_ostree 192.168.222.153:80 + +backend baserock_ostree_ssh + mode tcp + server baserock_ostree 192.168.222.153:22 + # Uploading artifacts can be slow; need a long timeout. + timeout client 12h + backend baserock_webserver_http server baserock_webserver 192.168.222.127:80 |