From 8d7c3e7731c81c346b274729fd1946fc5f0ed2ea Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 20 May 2015 19:30:10 +0000 Subject: [PATCH] Make labs and arm websites live in production. Pulling from f22 branch for now. On release morning we need to switch them to pull from master and have websites team merge f22 to master branch. --- playbooks/include/proxies-fedora-web.yml | 2 -- playbooks/include/proxies-websites.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml index d714a53ef0..2170e4288d 100644 --- a/playbooks/include/proxies-fedora-web.yml +++ b/playbooks/include/proxies-fedora-web.yml @@ -33,10 +33,8 @@ website: getfedora.org - role: fedora-web/labs website: labs.fedoraproject.org - when: env == "staging" - role: fedora-web/arm website: arm.fedoraproject.org - when: env == "staging" # Some other static content, not strictly part of "fedora-web" goes below here - role: fedora-docs/proxy diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 34fa6d61b2..c398a234b6 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -184,14 +184,12 @@ server_aliases: - labs.stg.fedoraproject.org cert_name: "{{wildcard_cert_name}}" - when: env == "staging" - role: httpd/website name: arm.fedoraproject.org server_aliases: - arm.stg.fedoraproject.org cert_name: "{{wildcard_cert_name}}" - when: env == "staging" - role: httpd/website name: boot.fedoraproject.org