diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml index 34dab0180d..c8bc7c0446 100644 --- a/playbooks/groups/sundries.yml +++ b/playbooks/groups/sundries.yml @@ -49,7 +49,7 @@ - role: membership-map/build when: master_sundries_node - role: developer/build - when: master_sundries_node and env == "staging" + when: master_sundries_node tasks: - include: "{{ tasks }}/yumrepos.yml" diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml index 250e75a6c5..ce1f7d1ba4 100644 --- a/playbooks/include/proxies-fedora-web.yml +++ b/playbooks/include/proxies-fedora-web.yml @@ -41,5 +41,4 @@ website: docs.fedoraproject.org - role: developer/website - website: developer.stg.fedoraproject.org - when: env == "staging" + website: developer.fedoraproject.org diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 5feef25535..0e60bed739 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -422,13 +422,12 @@ cert_name: "{{wildcard_cert_name}}" - role: httpd/website - name: developer.stg.fedoraproject.org + name: developer.fedoraproject.org server_aliases: [developer.stg.fedoraproject.org] # Set this explicitly to stg here.. as per the original puppet config. SSLCertificateChainFile: wildcard-2014.stg.fedoraproject.org.intermediate.cert sslonly: true cert_name: "{{wildcard_cert_name}}" - when: env == "staging" # Kinda silly that we have two entries here, one for prod and one for stg. # This is inherited from our puppet setup -- we can collapse them as soon as