infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

Move developer.fedoraproject.org site live.

Browse source
This commit is contained in:
Kevin Fenzi 2015-10-30 17:14:16 +00:00
parent c15440b633
commit 94d1d057ff
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
playbooks/groups/sundries.yml
View file

@ -49,7 +49,7 @@
- role: membership-map/build - role: membership-map/build
when: master_sundries_node when: master_sundries_node
- role: developer/build - role: developer/build
when: master_sundries_node and env == "staging" when: master_sundries_node
tasks: tasks:
- include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/yumrepos.yml"

3
playbooks/include/proxies-fedora-web.yml
View file

@ -41,5 +41,4 @@
website: docs.fedoraproject.org website: docs.fedoraproject.org
- role: developer/website - role: developer/website
website: developer.stg.fedoraproject.org website: developer.fedoraproject.org
when: env == "staging"

3
playbooks/include/proxies-websites.yml
View file

@ -422,13 +422,12 @@
cert_name: "{{wildcard_cert_name}}" cert_name: "{{wildcard_cert_name}}"
- role: httpd/website - role: httpd/website
name: developer.stg.fedoraproject.org name: developer.fedoraproject.org
server_aliases: [developer.stg.fedoraproject.org] server_aliases: [developer.stg.fedoraproject.org]
# Set this explicitly to stg here.. as per the original puppet config. # Set this explicitly to stg here.. as per the original puppet config.
SSLCertificateChainFile: wildcard-2014.stg.fedoraproject.org.intermediate.cert SSLCertificateChainFile: wildcard-2014.stg.fedoraproject.org.intermediate.cert
sslonly: true sslonly: true
cert_name: "{{wildcard_cert_name}}" cert_name: "{{wildcard_cert_name}}"
when: env == "staging"
# Kinda silly that we have two entries here, one for prod and one for stg. # 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 # This is inherited from our puppet setup -- we can collapse them as soon as