diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 4ac62d121a..55de1cac86 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -533,3 +533,9 @@ localpath: /fas3 proxyurl: http://localhost:10052 when: env == "staging" + + - role: httpd/reverseproxy + website: modernpaste.fedoraproject.org + destname: modernpaste + proxyurl: http://localhost:10055 + when: env == "staging" diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 3fd6641b7d..d3bbea9ace 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -457,6 +457,13 @@ - www.fpaste.org cert_name: "{{wildcard_cert_name}}" + - role: httpd/website + name: modernpaste.fedoraproject.org + server_aliases: + - modernpaste.stg.fedoraproject.org + cert_name: "{{wildcard_cert_name}}" + when: env == "staging" + - role: httpd/website name: apps.fedoraproject.org server_aliases: [apps.stg.fedoraproject.org] diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index 3df77ca845..15e516ca1e 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -341,6 +341,14 @@ listen docker-candidate-registry 0.0.0.0:10054 balance hdr(appserver) server docker-candidate-registry01 docker-candidate-registry01:5000 check inter 10s rise 1 fall 2 +{% if env == "staging" %} + +listen modernpaste 0.0.0.0:10055 + balance hdr(appserver) + server modernpaste01 modernpaste01:80 check inter 10s rise 1 fall 2 + option httpchk GET / + +{% endif %} # Apache doesn't handle the initial connection here like the other proxy # entries. This proxy also doesn't use the http mode like the others.