From 18d37c78759b7db5e9e4e44b7591b05bf07c290b Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Fri, 2 Sep 2016 14:34:57 +0000 Subject: [PATCH] Enable candidate registry on prod Signed-off-by: Patrick Uiterwijk --- playbooks/include/proxies-fedora-web.yml | 1 - playbooks/include/proxies-reverseproxy.yml | 1 - playbooks/include/proxies-websites.yml | 1 - roles/haproxy/templates/haproxy.cfg | 2 -- 4 files changed, 5 deletions(-) diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml index da9387573e..51f146d758 100644 --- a/playbooks/include/proxies-fedora-web.yml +++ b/playbooks/include/proxies-fedora-web.yml @@ -45,7 +45,6 @@ website: registry.fedoraproject.org - role: fedora-web/candidate-registry website: candidate-registry.fedoraproject.org - when: env == "staging" - role: fedora-web/codecs website: codecs.fedoraproject.org - role: fedora-web/alt diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index c911b79eb3..4ac62d121a 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -505,7 +505,6 @@ website: candidate-registry.fedoraproject.org destname: candidate-registry proxyurl: http://localhost:10048 - when: env == "staging" - role: httpd/reverseproxy website: retrace.fedoraproject.org diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index b1c0f4e355..3fd6641b7d 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -503,7 +503,6 @@ server_aliases: [candidate-registry.stg.fedoraproject.org] sslonly: true cert_name: "{{wildcard_cert_name}}" - when: env == "staging" - role: httpd/website name: retrace.fedoraproject.org diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index ef0ed3e0d8..3df77ca845 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -336,13 +336,11 @@ listen ipa 0.0.0.0:10053 option httpchk GET / {% endif %} -{% if env == "staging" %} 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 -{% 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.