From b3deefcb6a159f02bafaf04c2894196f74f35b1d Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Wed, 15 Feb 2017 21:32:30 +0000 Subject: [PATCH] cut over proxies Signed-off-by: Ricky Elrod --- playbooks/include/proxies-reverseproxy.yml | 7 ------- playbooks/include/proxies-websites.yml | 8 +------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 4d1fb78530..0711056ffb 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -142,17 +142,10 @@ # Talk directly to the app server, not haproxy proxyurl: http://localhost:10009 - - role: httpd/reverseproxy - website: paste.fedoraproject.org - destname: sticky-notes - proxyurl: "{{ varnish_url }}" - when: env != "staging" - - role: httpd/reverseproxy website: paste.fedoraproject.org destname: modernpaste proxyurl: http://localhost:10055 - when: env == "staging" - role: httpd/reverseproxy website: admin.fedoraproject.org diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 44118ac579..dfcc454eb9 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -457,6 +457,7 @@ name: paste.fedoraproject.org server_aliases: - paste.stg.fedoraproject.org + - modernpaste.stg.fedoraproject.org cert_name: "{{wildcard_cert_name}}" # # Make a website here so we can redirect it to paste.fedoraproject.org @@ -467,13 +468,6 @@ - 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: koji.fedoraproject.org sslonly: true