From 6d5ef51f05d24009fa9f76cd87a38d1ebffb49d9 Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Fri, 8 May 2015 22:17:36 +0000 Subject: [PATCH] forgot to add beaker-stg to master.yml and websites --- master.yml | 1 + playbooks/include/proxies-websites.yml | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/master.yml b/master.yml index df341e4a08..88c780e92d 100644 --- a/master.yml +++ b/master.yml @@ -23,6 +23,7 @@ - include: /srv/web/infra/ansible/playbooks/groups/badges-web.yml - include: /srv/web/infra/ansible/playbooks/groups/bastion.yml - include: /srv/web/infra/ansible/playbooks/groups/beaker.yml +- include: /srv/web/infra/ansible/playbooks/groups/beaker-stg.yml - include: /srv/web/infra/ansible/playbooks/groups/blockerbugs.yml - include: /srv/web/infra/ansible/playbooks/groups/bodhi.yml - include: /srv/web/infra/ansible/playbooks/groups/bodhi-backend.yml diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 56407ec63a..34fa6d61b2 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -451,3 +451,13 @@ server_aliases: [geoip.stg.fedoraproject.org] sslonly: true cert_name: "{{wildcard_cert_name}}" + + - role: httpd/website + name: beaker.stg.fedoraproject.org + server_aliases: [beaker.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" +