From 7e3a05f84099cc0b51930b6ed214fa670660651d Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 30 Apr 2015 19:46:39 +0000 Subject: [PATCH 1/2] beaker01 moved to virthost-comm04.qa --- inventory/host_vars/beaker01.qa.fedoraproject.org | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inventory/host_vars/beaker01.qa.fedoraproject.org b/inventory/host_vars/beaker01.qa.fedoraproject.org index 6b455fbf83..9e14770848 100644 --- a/inventory/host_vars/beaker01.qa.fedoraproject.org +++ b/inventory/host_vars/beaker01.qa.fedoraproject.org @@ -4,7 +4,7 @@ gw: 10.5.124.254 dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-6 ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/ -volgroup: /dev/Guests00 +volgroup: /dev/vg_guests eth0_ip: 10.5.124.228 -vmhost: virthost-comm01.qa.fedoraproject.org +vmhost: virthost-comm04.qa.fedoraproject.org datacenter: phx2 From c32bae56103eec7e693ccd10853bc67423b4776c Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 30 Apr 2015 19:55:25 +0000 Subject: [PATCH 2/2] Add secondary httpd/website config. --- playbooks/groups/secondary.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/playbooks/groups/secondary.yml b/playbooks/groups/secondary.yml index ada3aa0798..14f8dc597e 100644 --- a/playbooks/groups/secondary.yml +++ b/playbooks/groups/secondary.yml @@ -47,6 +47,20 @@ nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3", nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/fedora-secondary' } + - role: httpd/mod_ssl + + - role: httpd/certificate + name: wildcard-2014.fedoraproject.org + SSLCertificateChainFile: wildcard-2014.fedoraproject.org.intermediate.cert + + - role: httpd/website + name: secondary.fedoraproject.org + cert_name: "{{wildcard_cert_name}}" + server_aliases: + - alt.fedoraproject.org + - archive.fedoraproject.org + - archives.fedoraproject.org + tasks: - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml"